diff --git a/hesabixCore/src/Controller/AdminController.php b/hesabixCore/src/Controller/AdminController.php
index 64f8e24..dc092b5 100644
--- a/hesabixCore/src/Controller/AdminController.php
+++ b/hesabixCore/src/Controller/AdminController.php
@@ -630,35 +630,6 @@ class AdminController extends AbstractController
         throw $this->createNotFoundException();
     }
 
-    /**
-     * @throws Exception
-     */
-    #[Route('/api/admin/database/backup/create', name: 'app_admin_database_backup_create')]
-    public function app_admin_database_backup_create(KernelInterface $kernel): JsonResponse
-    {
-        $application = new Application($kernel);
-        $application->setAutoExit(false);
-
-        $input = new ArrayInput([
-            'command' => 'doctrine:schema:create',
-            // (optional) define the value of command arguments
-            '--dump-sql' => true,
-        ]);
-
-        // You can use NullOutput() if you don't need the output
-        $output = new BufferedOutput();
-        $application->run($input, $output);
-        // return the output, don't use if you used NullOutput()
-        $content = $output->fetch();
-        $time = time();
-        $file = fopen(dirname(__DIR__, 3) . '/hesabixBackup/versions/Hesabix-' . $time . '.sql', 'w');
-        fwrite($file, $content);
-        fclose($file);
-        return $this->json([
-            'result' => 0,
-            'filename' => 'Hesabix-' . $time . '.sql',
-        ]);
-    }
     #[Route('/api/admin/logs/last', name: 'api_admin_logs_last')]
     public function api_admin_logs_last(Extractor $extractor, Jdate $jdate, EntityManagerInterface $entityManager): JsonResponse
     {
diff --git a/hesabixCore/src/Controller/BuyController.php b/hesabixCore/src/Controller/BuyController.php
index 464fa40..9d24566 100644
--- a/hesabixCore/src/Controller/BuyController.php
+++ b/hesabixCore/src/Controller/BuyController.php
@@ -145,10 +145,16 @@ class BuyController extends AbstractController
             $hesabdariRow->setBd(0);
             $hesabdariRow->setBs($params['discountAll']);
             $ref = $entityManager->getRepository(HesabdariTable::class)->findOneBy([
-                'code' => '51' //  تخفیفات نقدی خرید 
+                'code' => '51'
             ]);
             $hesabdariRow->setRef($ref);
             $entityManager->persist($hesabdariRow);
+            
+            // ذخیره نوع تخفیف و درصد آن
+            $doc->setDiscountType($params['discountType'] ?? 'fixed');
+            if (isset($params['discountPercent'])) {
+                $doc->setDiscountPercent((float)$params['discountPercent']);
+            }
         }
         $doc->setDes($params['des']);
         $doc->setDate($params['date']);
diff --git a/hesabixCore/src/Controller/CommodityController.php b/hesabixCore/src/Controller/CommodityController.php
index 0a3a4e7..e2c2d4c 100644
--- a/hesabixCore/src/Controller/CommodityController.php
+++ b/hesabixCore/src/Controller/CommodityController.php
@@ -139,8 +139,11 @@ class CommodityController extends AbstractController
                 ]);
                 $count = 0;
                 foreach ($rows as $row) {
-                    $count += $row->getDoc()->getType() === 'buy' ? $row->getCommdityCount() : -$row->getCommdityCount();
-                }
+                    if ($row->getDoc()->getType() === 'buy' || $row->getDoc()->getType() === 'open_balance') {
+                        $count += $row->getCommdityCount();
+                    } else {
+                        $count -= $row->getCommdityCount();
+                    }                }
                 $temp['count'] = $count;
             }
             return $temp;
diff --git a/hesabixCore/src/Controller/OpenbalanceController.php b/hesabixCore/src/Controller/OpenbalanceController.php
index 33dfeca..1b12cff 100644
--- a/hesabixCore/src/Controller/OpenbalanceController.php
+++ b/hesabixCore/src/Controller/OpenbalanceController.php
@@ -8,6 +8,7 @@ use App\Entity\HesabdariDoc;
 use App\Entity\HesabdariTable;
 use App\Entity\Person;
 use App\Entity\Salary;
+use App\Entity\Commodity;
 use App\Entity\Shareholder;
 use App\Service\Access;
 use App\Service\Explore;
@@ -113,6 +114,18 @@ class OpenbalanceController extends AbstractController
         }
         $res['shareholders'] = $shareholderDet;
 
+        //load commodities
+        foreach ($doc->getHesabdariRows() as $row) {
+            if ($row->getCommodity()) {
+                $temp = [];
+                $temp['info'] = Explore::ExploreCommodity($row->getCommodity());
+                $temp['count'] = $row->getCommdityCount();
+                $temp['price'] = $row->getBs()/$row->getCommdityCount();
+                $temp['totalPrice'] = $row->getBs();
+                $res['commodities'][] = $temp;
+            }
+        }
+
         return $this->json($extractor->operationSuccess($res));
     }
 
@@ -425,4 +438,99 @@ class OpenbalanceController extends AbstractController
         $entityManagerInterface->flush();
         return $this->json($extractor->operationSuccess());
     }
+
+
+    #[Route('/api/openbalance/save/commodities', name: 'app_openbalance_save_commodity')]
+    public function app_openbalance_save_commodity(Provider $provider,Jdate $jdate, Request $request, Access $access, EntityManagerInterface $entityManagerInterface, Extractor $extractor): Response
+    {
+        $acc = $access->hasRole('accounting');
+        if (!$acc)
+            throw $this->createAccessDeniedException();
+
+        $params = [];
+        if ($content = $request->getContent()) {
+            $params = json_decode($content, true);
+        }
+
+        //get open balance doc
+        $doc = $entityManagerInterface->getRepository(HesabdariDoc::class)->findOneBy([
+            'year' => $acc['year'],
+            'bid' => $acc['bid'],
+            'type' => 'open_balance',
+            'money' => $acc['money']
+        ]);
+        if (!$doc) {
+            $doc = new HesabdariDoc();
+            $doc->setBid($acc['bid']);
+            $doc->setAmount(0);
+            $doc->setDateSubmit(time());
+            $doc->setMoney($acc['money']);
+            $doc->setSubmitter($this->getUser());
+            $doc->setYear($acc['year']);
+            $doc->setDes('سند افتتاحیه');
+            $doc->setDate($jdate->jdate('Y/n/d', time()));
+            $doc->setType('open_balance');
+            $doc->setCode($provider->getAccountingCode($acc['bid'],'accounting'));
+            $entityManagerInterface->persist($doc);
+        }
+
+        // ایجاد آرایه از کدهای کالاهای ارسالی
+        $submittedCommodityCodes = array_map(function($param) {
+            return $param['info']['code'];
+        }, $params);
+
+        // حذف سطرهای مربوط به کالاهایی که در لیست ارسالی نیستند
+        foreach ($doc->getHesabdariRows() as $row) {
+            if ($row->getCommodity() && $row->getRefData() == 'commodity') {
+                $commodityCode = $row->getCommodity()->getCode();
+                if (!in_array($commodityCode, $submittedCommodityCodes)) {
+                    $doc->removeHesabdariRow($row);
+                    $entityManagerInterface->remove($row);
+                }
+            }
+        }
+
+        foreach ($params as $param) {
+            $commodity = $entityManagerInterface->getRepository(Commodity::class)->findOneBy([
+                'code' => $param['info']['code'],
+                'bid' => $acc['bid'],
+            ]);
+            if(!$commodity) return $this->json($extractor->operationFail());
+
+            $ExistBefore = false;
+            foreach ($doc->getHesabdariRows() as $row) {
+                if ($row->getCommodity() == $commodity) {
+                    if ($param['count'] != 0) {
+                        $ExistBefore = true;
+                        $row->setCommdityCount($param['count']);
+                        $row->setBs($param['price'] * $param['count']);
+                        $entityManagerInterface->persist($row);
+                    }
+                }
+            }
+            if ((!$ExistBefore) && $param['count'] != 0) {
+                $row = new HesabdariRow();
+                $row->setDoc($doc);
+                $row->setCommodity($commodity);
+                $row->setCommdityCount($param['count']);
+                $row->setBs(0);
+                $row->setBd($param['price'] * $param['count']);
+                $row->setRefData('commodity');
+                $row->setBid($acc['bid']);
+                $row->setYear($acc['year']);
+                $row->setDes('موجودی اول دوره');
+                $row->setRef($entityManagerInterface->getRepository(HesabdariTable::class)->findOneBy(['code' => 120]));
+                $entityManagerInterface->persist($row);
+            }
+        }
+
+        //calculate amount of document
+        foreach ($doc->getHesabdariRows() as $row) {
+            $doc->setAmount($doc->getAmount() + $row->getBd());
+        }
+        $entityManagerInterface->persist($doc);
+
+        $entityManagerInterface->flush();
+        return $this->json($extractor->operationSuccess());
+    }
 }
diff --git a/hesabixCore/src/Controller/ReportController.php b/hesabixCore/src/Controller/ReportController.php
index e0f819c..7d65782 100644
--- a/hesabixCore/src/Controller/ReportController.php
+++ b/hesabixCore/src/Controller/ReportController.php
@@ -419,4 +419,137 @@ class ReportController extends AbstractController
             return $this->json(['error' => 'An error occurred: ' . $e->getMessage()], 500);
         }
     }
+
+    #[Route('/api/report/top-selling-commodities-by-price', name: 'app_report_top_selling_commodities_by_price', methods: ['POST'])]
+    public function app_report_top_selling_commodities_by_price(Access $access, Explore $explore, Jdate $jdate, Request $request, EntityManagerInterface $entityManager, LoggerInterface $logger): JsonResponse
+    {
+        $acc = $access->hasRole('report');
+        if (!$acc) {
+            $acc = $access->hasRole('sell');
+            if (!$acc) {
+                throw $this->createAccessDeniedException('شما دسترسی لازم برای مشاهده این اطلاعات را ندارید.');
+            }
+        }
+
+        /** @var Business $business */
+        $business = $acc['bid'];
+        /** @var Year $year */
+        $year = $acc['year'];
+
+        $payload = $request->getPayload();
+        $period = $payload->get('period', 'year');
+        $limit = (int) $payload->get('limit', 10);
+        if ($limit < 3) {
+            $limit = 3;
+        }
+
+        $today = $jdate->GetTodayDate();
+        list($currentYear, $currentMonth, $currentDay) = explode('/', $today);
+
+        switch ($period) {
+            case 'today':
+                $dateStart = $today;
+                $dateEnd = $today;
+                break;
+            case 'week':
+                $weekDay = (int) $jdate->jdate('w', time());
+                $daysToSubtract = $weekDay;
+                $dateStart = $jdate->shamsiDate(0, 0, -$daysToSubtract);
+                $dateEnd = $jdate->shamsiDate(0, 0, 6 - $weekDay);
+                break;
+            case 'month':
+                $dateStart = "$currentYear/$currentMonth/01";
+                $dateEnd = "$currentYear/$currentMonth/" . $jdate->jdate('t', $jdate->jallaliToUnixTime("$currentYear/$currentMonth/01"));
+                break;
+            case 'year':
+            default:
+                $dateStart = $jdate->jdate('Y/m/d', $year->getStart());
+                $dateEnd = $jdate->jdate('Y/m/d', $year->getEnd());
+                break;
+        }
+
+        $queryBuilder = $entityManager->createQueryBuilder();
+        $queryBuilder
+            ->select('c.id AS id')
+            ->addSelect('c.code AS code')
+            ->addSelect('c.name AS name')
+            ->addSelect('c.des AS des')
+            ->addSelect('c.priceBuy AS priceBuy')
+            ->addSelect('c.priceSell AS priceSell')
+            ->addSelect('c.khadamat AS khadamat')
+            ->addSelect('c.orderPoint AS orderPoint')
+            ->addSelect('c.commodityCountCheck AS commodityCountCheck')
+            ->addSelect('c.minOrderCount AS minOrderCount')
+            ->addSelect('c.dayLoading AS dayLoading')
+            ->addSelect('c.speedAccess AS speedAccess')
+            ->addSelect('c.withoutTax AS withoutTax')
+            ->addSelect('c.barcodes AS barcodes')
+            ->addSelect('IDENTITY(c.unit) AS unitId')
+            ->addSelect('u.name AS unit')
+            ->addSelect('SUM(CAST(hr.commdityCount AS INTEGER)) AS totalCount')
+            ->addSelect('SUM(hr.bs) AS totalPrice') // محاسبه مجموع قیمت فروش با استفاده از فیلد bs
+            ->from(HesabdariRow::class, 'hr')
+            ->innerJoin('hr.doc', 'hd')
+            ->innerJoin('hr.commodity', 'c')
+            ->leftJoin('c.unit', 'u')
+            ->where('hd.bid = :business')
+            ->andWhere('hd.type = :type')
+            ->andWhere('hr.year = :year')
+            ->andWhere('hd.date BETWEEN :dateStart AND :dateEnd')
+            ->setParameter('business', $business)
+            ->setParameter('type', 'sell')
+            ->setParameter('year', $year)
+            ->setParameter('dateStart', $dateStart)
+            ->setParameter('dateEnd', $dateEnd)
+            ->groupBy('c.id')
+            ->addGroupBy('u.name')
+            ->orderBy('totalPrice', 'DESC') // مرتب‌سازی بر اساس مجموع قیمت فروش
+            ->setMaxResults($limit);
+
+        try {
+            $results = $queryBuilder->getQuery()->getArrayResult();
+            $logger->info('Query executed successfully', [
+                'sql' => $queryBuilder->getQuery()->getSQL(),
+                'params' => $queryBuilder->getQuery()->getParameters()->toArray(),
+                'results' => $results
+            ]);
+
+            if (empty($results)) {
+                $logger->info('No results returned from query');
+                return $this->json(['message' => 'No data found'], 200);
+            }
+
+            $topCommodities = array_map(function ($result) {
+                return [
+                    'id' => $result['id'],
+                    'code' => $result['code'],
+                    'name' => $result['name'],
+                    'des' => $result['des'],
+                    'priceBuy' => $result['priceBuy'],
+                    'priceSell' => $result['priceSell'],
+                    'khadamat' => $result['khadamat'],
+                    'orderPoint' => $result['orderPoint'],
+                    'commodityCountCheck' => $result['commodityCountCheck'],
+                    'minOrderCount' => $result['minOrderCount'],
+                    'dayLoading' => $result['dayLoading'],
+                    'speedAccess' => $result['speedAccess'],
+                    'withoutTax' => $result['withoutTax'],
+                    'barcodes' => $result['barcodes'],
+                    'unit' => $result['unit'] ?? '',
+                    'count' => (int) $result['totalCount'],
+                    'totalPrice' => (float) $result['totalPrice'] // مجموع قیمت فروش
+                ];
+            }, $results);
+
+            return $this->json($topCommodities);
+        } catch (\Exception $e) {
+            $logger->error('Error in top-selling commodities by price query', [
+                'message' => $e->getMessage(),
+                'sql' => $queryBuilder->getQuery()->getSQL(),
+                'params' => $queryBuilder->getQuery()->getParameters()->toArray(),
+                'trace' => $e->getTraceAsString()
+            ]);
+            return $this->json(['error' => 'An error occurred: ' . $e->getMessage()], 500);
+        }
+    }
 }
\ No newline at end of file
diff --git a/hesabixCore/src/Controller/RfsellController.php b/hesabixCore/src/Controller/RfsellController.php
index ceaa58d..4f281ca 100644
--- a/hesabixCore/src/Controller/RfsellController.php
+++ b/hesabixCore/src/Controller/RfsellController.php
@@ -146,10 +146,16 @@ class RfsellController extends AbstractController
             $hesabdariRow->setBd(0);
             $hesabdariRow->setBs($params['discountAll']);
             $ref = $entityManager->getRepository(HesabdariTable::class)->findOneBy([
-                'code' => '104' // سایر هزینه های پخش و خرید
+                'code' => '104'
             ]);
             $hesabdariRow->setRef($ref);
             $entityManager->persist($hesabdariRow);
+            
+            // ذخیره نوع تخفیف و درصد آن
+            $doc->setDiscountType($params['discountType'] ?? 'fixed');
+            if (isset($params['discountPercent'])) {
+                $doc->setDiscountPercent((float)$params['discountPercent']);
+            }
         }
         $doc->setDes($params['des']);
         $doc->setDate($params['date']);
diff --git a/hesabixCore/src/Controller/SellController.php b/hesabixCore/src/Controller/SellController.php
index d1809d1..94888c2 100644
--- a/hesabixCore/src/Controller/SellController.php
+++ b/hesabixCore/src/Controller/SellController.php
@@ -27,6 +27,9 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use App\Entity\BankAccount;
+use App\Entity\Cashdesk;
+use App\Entity\Salary;
 
 class SellController extends AbstractController
 {
@@ -72,7 +75,7 @@ class SellController extends AbstractController
         foreach ($doc->getHesabdariRows() as $item) {
             if ($item->getCommodity() && $item->getCommdityCount()) {
                 if ($acc['bid']->getProfitCalctype() == 'simple') {
-                    $profit = $profit + (($item->getCommodity()->getPriceSell() - $item->getCommodity()->getPriceSell()) * $item->getCommdityCount());
+                    $profit = $profit + (($item->getCommodity()->getPriceSell() - $item->getCommodity()->getPriceBuy()) * $item->getCommdityCount());
                 } elseif ($acc['bid']->getProfitCalctype() == 'lis') {
                     $last = $entityManager->getRepository(HesabdariRow::class)->findOneBy([
                         'commodity' => $item->getCommodity(),
@@ -82,7 +85,7 @@ class SellController extends AbstractController
                     ]);
                     if ($last) {
                         $price = $last->getBd() / $last->getCommdityCount();
-                        $profit = $profit + ((($item->getBs() / $item->getCommdityCount()) - $price) * $item->getCommdityCount());
+                        $profit = $profit + (($item->getBs() / $item->getCommdityCount() - $price) * $item->getCommdityCount());
                     } else {
                         $profit = $profit + $item->getBs();
                     }
@@ -101,7 +104,7 @@ class SellController extends AbstractController
                     }
                     if ($count != 0) {
                         $price = $avg / $count;
-                        $profit = $profit + ((($item->getBs() / $item->getCommdityCount()) - $price) * $item->getCommdityCount());
+                        $profit = $profit + (($item->getBs() / $item->getCommdityCount() - $price) * $item->getCommdityCount());
                     } else {
                         $profit = $profit + $item->getBs();
                     }
@@ -195,6 +198,12 @@ class SellController extends AbstractController
             ]);
             $hesabdariRow->setRef($ref);
             $entityManager->persist($hesabdariRow);
+            
+            // ذخیره نوع تخفیف و درصد آن
+            $doc->setDiscountType($params['discountType'] ?? 'fixed');
+            if (isset($params['discountPercent'])) {
+                $doc->setDiscountPercent((float)$params['discountPercent']);
+            }
         }
         $doc->setDes($params['des']);
         $doc->setDate($params['date']);
@@ -264,10 +273,9 @@ class SellController extends AbstractController
                 $pair = $entityManager->getRepository(HesabdariDoc::class)->findOneBy([
                     'bid' => $acc['bid'],
                     'code' => $pairCode,
-                    'type' => 'buy'
                 ]);
                 if ($pair) {
-                    $doc->addPairDoc($pair);
+                    $pair->addRelatedDoc($doc);
                 }
             }
         }
@@ -577,7 +585,6 @@ class SellController extends AbstractController
         ]);
     }
 
-    // متد calculateProfit بدون تغییر
     private function calculateProfit(int $docId, array $acc, EntityManagerInterface $entityManager): int
     {
         $profit = 0;
@@ -591,7 +598,7 @@ class SellController extends AbstractController
                             ->findOneBy(['commodity' => $commodityId, 'bs' => 0], ['id' => 'DESC']);
                         if ($last) {
                             $price = $last->getBd() / $last->getCommdityCount();
-                            $profit += ((($item->getBs() / $item->getCommdityCount()) - $price) * $item->getCommdityCount());
+                            $profit += ($item->getBs() / $item->getCommdityCount() - $price) * $item->getCommdityCount();
                         } else {
                             $profit += $item->getBs();
                         }
@@ -600,7 +607,7 @@ class SellController extends AbstractController
                     }
                 } elseif ($acc['bid']->getProfitCalctype() === 'simple') {
                     if ($item->getCommodity() && $item->getCommodity()->getPriceSell() !== null && $item->getCommodity()->getPriceBuy() !== null) {
-                        $profit += (($item->getCommodity()->getPriceSell() - $item->getCommodity()->getPriceBuy()) * $item->getCommdityCount());
+                        $profit += ($item->getCommodity()->getPriceSell() - $item->getCommodity()->getPriceBuy()) * $item->getCommdityCount();
                     } else {
                         $profit += $item->getBs();
                     }
@@ -608,11 +615,15 @@ class SellController extends AbstractController
                     if ($commodityId) {
                         $lasts = $entityManager->getRepository(HesabdariRow::class)
                             ->findBy(['commodity' => $commodityId, 'bs' => 0], ['id' => 'DESC']);
-                        $avg = array_sum(array_map(fn($last) => $last->getBd(), $lasts));
-                        $count = array_sum(array_map(fn($last) => $last->getCommdityCount(), $lasts));
+                        $avg = 0;
+                        $count = 0;
+                        foreach ($lasts as $last) {
+                            $avg += $last->getBd();
+                            $count += $last->getCommdityCount();
+                        }
                         if ($count != 0) {
                             $price = $avg / $count;
-                            $profit += ((($item->getBs() / $item->getCommdityCount()) - $price) * $item->getCommdityCount());
+                            $profit += ($item->getBs() / $item->getCommdityCount() - $price) * $item->getCommdityCount();
                         } else {
                             $profit += $item->getBs();
                         }
@@ -683,19 +694,27 @@ class SellController extends AbstractController
             throw $this->createAccessDeniedException();
 
         $params = json_decode($request->getContent(), true);
-        $printOptions = $params['printOptions'] ?? [];
-
-        // اضافه کردن کلیدهای پیش‌فرض
-        $printOptions = array_merge([
-            'note' => true,
-            'bidInfo' => true,
-            'taxInfo' => true,
-            'discountInfo' => true,
-            'pays' => false,
-            'paper' => 'A4-L',
-            'invoiceIndex' => false,
-            'businessStamp' => false
-        ], $printOptions);
+        $params['printers'] = $params['printers'] ?? false;
+        $params['pdf'] = $params['pdf'] ?? true;
+        $params['posPrint'] = $params['posPrint'] ?? false;
+        
+        // دریافت تنظیمات پیش‌فرض از PrintOptions
+        $printSettings = $entityManager->getRepository(PrintOptions::class)->findOneBy(['bid' => $acc['bid']]);
+        
+        // تنظیم مقادیر پیش‌فرض از تنظیمات ذخیره شده
+        $defaultOptions = [
+            'note' => $printSettings ? $printSettings->isSellNote() : true,
+            'bidInfo' => $printSettings ? $printSettings->isSellBidInfo() : true,
+            'taxInfo' => $printSettings ? $printSettings->isSellTaxInfo() : true,
+            'discountInfo' => $printSettings ? $printSettings->isSellDiscountInfo() : true,
+            'pays' => $printSettings ? $printSettings->isSellPays() : true,
+            'paper' => $printSettings ? $printSettings->getSellPaper() : 'A4-L',
+            'invoiceIndex' => $printSettings ? $printSettings->isSellInvoiceIndex() : true,
+            'businessStamp' => $printSettings ? $printSettings->isSellBusinessStamp() : true
+        ];
+        
+        // اولویت با پارامترهای ارسالی است
+        $printOptions = array_merge($defaultOptions, $params['printOptions'] ?? []);
 
         $doc = $entityManager->getRepository(HesabdariDoc::class)->findOneBy([
             'bid' => $acc['bid'],
@@ -717,43 +736,8 @@ class SellController extends AbstractController
             }
         }
         $pdfPid = 0;
-        if ($params['pdf']) {
-            $printOptions = [
-                'bidInfo' => true,
-                'pays' => true,
-                'taxInfo' => true,
-                'discountInfo' => true,
-                'note' => true,
-                'paper' => 'A4-L'
-            ];
-            if (array_key_exists('printOptions', $params)) {
-                if (array_key_exists('bidInfo', $params['printOptions'])) {
-                    $printOptions['bidInfo'] = $params['printOptions']['bidInfo'];
-                }
-                if (array_key_exists('pays', $params['printOptions'])) {
-                    $printOptions['pays'] = $params['printOptions']['pays'];
-                }
-                if (array_key_exists('taxInfo', $params['printOptions'])) {
-                    $printOptions['taxInfo'] = $params['printOptions']['taxInfo'];
-                }
-                if (array_key_exists('discountInfo', $params['printOptions'])) {
-                    $printOptions['discountInfo'] = $params['printOptions']['discountInfo'];
-                }
-                if (array_key_exists('note', $params['printOptions'])) {
-                    $printOptions['note'] = $params['printOptions']['note'];
-                }
-                if (array_key_exists('paper', $params['printOptions'])) {
-                    $printOptions['paper'] = $params['printOptions']['paper'];
-                }
-                if (array_key_exists('invoiceIndex', $params['printOptions'])) {
-                    $printOptions['invoiceIndex'] = $params['printOptions']['invoiceIndex'];
-                }
-                if (array_key_exists('businessStamp', $params['printOptions'])) {
-                    $printOptions['businessStamp'] = $params['printOptions']['businessStamp'];
-                }
-            }
+        if ($params['pdf'] == true || $params['printers'] == true) {
             $note = '';
-            $printSettings = $entityManager->getRepository(PrintOptions::class)->findOneBy(['bid' => $acc['bid']]);
             if ($printSettings) {
                 $note = $printSettings->getSellNoteString();
             }
@@ -775,7 +759,8 @@ class SellController extends AbstractController
                 $printOptions['paper']
             );
         }
-        if ($params['printers'] == true) {
+        if ($params['posPrint'] == true) {
+
             $pid = $provider->createPrint(
                 $acc['bid'],
                 $this->getUser(),
@@ -831,4 +816,473 @@ class SellController extends AbstractController
             'daySells' => $daySells
         ]);
     }
+
+    #[Route('/api/sell/v2/mod', name: 'app_sell_v2_mod', methods: ['POST'])]
+    public function app_sell_v2_mod(
+        AccountingPermissionService $accountingPermissionService,
+        PluginService $pluginService,
+        SMS $SMS,
+        Provider $provider,
+        Extractor $extractor,
+        Request $request,
+        Access $access,
+        Log $log,
+        EntityManagerInterface $entityManager,
+        registryMGR $registryMGR
+    ): JsonResponse {
+        $params = [];
+        if ($content = $request->getContent()) {
+            $params = json_decode($content, true);
+        }
+
+        $acc = $access->hasRole('sell');
+        if (!$acc) {
+            throw $this->createAccessDeniedException();
+        }
+
+        $pkgcntr = $accountingPermissionService->canRegisterAccountingDoc($acc['bid']);
+        if ($pkgcntr['code'] == 4) {
+            return $this->json([
+                'result' => 4,
+                'message' => $pkgcntr['message']
+            ]);
+        }
+
+        try {
+            // بررسی وجود فاکتور برای ویرایش
+            if (!empty($params['id'])) {
+                $doc = $entityManager->getRepository(HesabdariDoc::class)->findOneBy([
+                    'bid' => $acc['bid'],
+                    'year' => $acc['year'],
+                    'code' => $params['id'],
+                    'money' => $acc['money']
+                ]);
+                if (!$doc) {
+                    return $this->json($extractor->notFound());
+                }
+
+                // حذف سطرهای قبلی
+                $rows = $doc->getHesabdariRows();
+                foreach ($rows as $row) {
+                    $entityManager->remove($row);
+                }
+            } else {
+                // ایجاد فاکتور جدید
+                $doc = new HesabdariDoc();
+                $doc->setBid($acc['bid']);
+                $doc->setYear($acc['year']);
+                $doc->setDateSubmit(time());
+                $doc->setType('sell');
+                $doc->setSubmitter($this->getUser());
+                $doc->setMoney($acc['money']);
+                $doc->setCode($provider->getAccountingCode($acc['bid'], 'accounting'));
+            }
+
+            // تنظیم اطلاعات اصلی فاکتور
+            $doc->setDes($params['invoiceDescription']);
+            $doc->setDate($params['invoiceDate']);
+            $doc->setTaxPercent($params['taxPercent'] ?? 0);
+
+            // افزودن هزینه حمل
+            if ($params['shippingCost'] > 0) {
+                $hesabdariRow = new HesabdariRow();
+                $hesabdariRow->setDes('حمل و نقل کالا');
+                $hesabdariRow->setBid($acc['bid']);
+                $hesabdariRow->setYear($acc['year']);
+                $hesabdariRow->setDoc($doc);
+                $hesabdariRow->setBs($params['shippingCost']);
+                $hesabdariRow->setBd(0);
+                $ref = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '61']);
+                $hesabdariRow->setRef($ref);
+                $entityManager->persist($hesabdariRow);
+            }
+
+            // افزودن تخفیف کلی
+            $totalDiscount = 0;
+            if ($params['discountType'] === 'percent') {
+                $totalDiscount = round(($params['totalInvoice'] * $params['discountPercent']) / 100);
+                $doc->setDiscountType('percent');
+                $doc->setDiscountPercent((float)$params['discountPercent']);
+            } else {
+                $totalDiscount = $params['totalDiscount'];
+                $doc->setDiscountType('fixed');
+                $doc->setDiscountPercent(null);
+            }
+
+            if ($totalDiscount > 0) {
+                $hesabdariRow = new HesabdariRow();
+                $hesabdariRow->setDes('تخفیف فاکتور');
+                $hesabdariRow->setBid($acc['bid']);
+                $hesabdariRow->setYear($acc['year']);
+                $hesabdariRow->setDoc($doc);
+                $hesabdariRow->setBs(0);
+                $hesabdariRow->setBd($totalDiscount);
+                $ref = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '104']);
+                $hesabdariRow->setRef($ref);
+                $entityManager->persist($hesabdariRow);
+            }
+
+            // افزودن اقلام فاکتور
+            $sumTax = 0;
+            $sumTotal = 0;
+            foreach ($params['items'] as $item) {
+                $sumTax += $item['tax'] ?? 0;
+                $sumTotal += $item['total'] ?? 0;
+
+                $hesabdariRow = new HesabdariRow();
+                $hesabdariRow->setDes($item['description'] ?? '');
+                $hesabdariRow->setBid($acc['bid']);
+                $hesabdariRow->setYear($acc['year']);
+                $hesabdariRow->setDoc($doc);
+                $hesabdariRow->setBs($item['total'] + ($item['tax'] ?? 0));
+                $hesabdariRow->setBd(0);
+                $hesabdariRow->setDiscount($item['discountAmount'] ?? 0);
+                $hesabdariRow->setTax($item['tax'] ?? 0);
+                $hesabdariRow->setDiscountType($item['showPercentDiscount'] ? 'percent' : 'fixed');
+                $hesabdariRow->setDiscountPercent($item['discountPercent'] ?? 0);
+
+                $ref = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '53']);
+                $hesabdariRow->setRef($ref);
+
+                $commodity = $entityManager->getRepository(Commodity::class)->findOneBy([
+                    'id' => $item['name']['id'],
+                    'bid' => $acc['bid']
+                ]);
+                if (!$commodity) {
+                    throw new \Exception('کالا یافت نشد');
+                }
+                $hesabdariRow->setCommodity($commodity);
+                $hesabdariRow->setCommdityCount($item['count']);
+
+                // به‌روزرسانی قیمت فروش کالا اگر تنظیم شده باشد
+                if ($acc['bid']->isCommodityUpdateSellPriceAuto() && $commodity->getPriceSell() != $item['price']) {
+                    $commodity->setPriceSell($item['price']);
+                    $entityManager->persist($commodity);
+                }
+
+                $entityManager->persist($hesabdariRow);
+            }
+
+            // افزودن ردیف مالیات
+            if ($sumTax > 0) {
+                $taxRow = new HesabdariRow();
+                $taxRow->setDes('مالیات بر ارزش افزوده');
+                $taxRow->setBid($acc['bid']);
+                $taxRow->setYear($acc['year']);
+                $taxRow->setDoc($doc);
+                $taxRow->setBs($sumTax);
+                $taxRow->setBd(0);
+                $taxRef = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '33']);
+                $taxRow->setRef($taxRef);
+                $entityManager->persist($taxRow);
+            }
+
+            // تنظیم مبلغ کل فاکتور
+            $doc->setAmount($sumTotal + $sumTax - $totalDiscount + $params['shippingCost']);
+
+            // افزودن سطر اصلی فاکتور
+            $hesabdariRow = new HesabdariRow();
+            $hesabdariRow->setDes('فاکتور فروش');
+            $hesabdariRow->setBid($acc['bid']);
+            $hesabdariRow->setYear($acc['year']);
+            $hesabdariRow->setDoc($doc);
+            $hesabdariRow->setBs(0);
+            $hesabdariRow->setBd($sumTotal + $sumTax + $params['shippingCost'] - $totalDiscount);
+            $ref = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '3']);
+            $hesabdariRow->setRef($ref);
+
+            $person = $entityManager->getRepository(Person::class)->findOneBy([
+                'bid' => $acc['bid'],
+                'id' => $params['customer']
+            ]);
+            if (!$person) {
+                throw new \Exception('خریدار یافت نشد');
+            }
+            $hesabdariRow->setPerson($person);
+            $entityManager->persist($hesabdariRow);
+
+            // ذخیره فاکتور
+            $entityManager->persist($doc);
+            $entityManager->flush();
+
+            // ایجاد لینک کوتاه اگر وجود نداشته باشد
+            if (!$doc->getShortlink()) {
+                $doc->setShortlink($provider->RandomString(8));
+                $entityManager->persist($doc);
+                $entityManager->flush();
+            }
+
+            // ثبت اسناد پرداخت
+            if (!empty($params['payments'])) {
+                foreach ($params['payments'] as $payment) {
+                    // ایجاد سند حسابداری جدید برای پرداخت
+                    $paymentDoc = new HesabdariDoc();
+                    $paymentDoc->setBid($acc['bid']);
+                    $paymentDoc->setYear($acc['year']);
+                    $paymentDoc->setDateSubmit(time());
+                    $paymentDoc->setType('sell_receive');
+                    $paymentDoc->setSubmitter($this->getUser());
+                    $paymentDoc->setMoney($acc['money']);
+                    $paymentDoc->setCode($provider->getAccountingCode($acc['bid'], 'accounting'));
+                    $paymentDoc->setDate($params['invoiceDate']);
+                    $paymentDoc->setDes($payment['description'] ?? 'دریافت وجه فاکتور فروش شماره ' . $doc->getCode());
+                    $paymentDoc->setAmount($payment['amount']);
+                    
+                    // ایجاد ارتباط با فاکتور اصلی
+                    $doc->addRelatedDoc($paymentDoc);
+                    
+                    // ایجاد سطرهای حسابداری بر اساس نوع پرداخت
+                    if ($payment['type'] === 'bank') {
+                        // دریافت از طریق حساب بانکی
+                        $bankRow = new HesabdariRow();
+                        $bankRow->setDes($payment['description'] ?? 'دریافت وجه فاکتور فروش شماره ' . $doc->getCode());
+                        $bankRow->setBid($acc['bid']);
+                        $bankRow->setYear($acc['year']);
+                        $bankRow->setDoc($paymentDoc);
+                        $bankRow->setBs(0);
+                        $bankRow->setBd($payment['amount']);
+                        $bankRef = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '5']);
+                        $bankRow->setRef($bankRef);
+                        $bankRow->setBank($entityManager->getRepository(BankAccount::class)->find($payment['bank']));
+                        $entityManager->persist($bankRow);
+                    } elseif ($payment['type'] === 'cashdesk') {
+                        // دریافت از طریق صندوق
+                        $cashdeskRow = new HesabdariRow();
+                        $cashdeskRow->setDes($payment['description'] ?? 'دریافت وجه فاکتور فروش شماره ' . $doc->getCode());
+                        $cashdeskRow->setBid($acc['bid']);
+                        $cashdeskRow->setYear($acc['year']);
+                        $cashdeskRow->setDoc($paymentDoc);
+                        $cashdeskRow->setBs(0);
+                        $cashdeskRow->setBd($payment['amount']);
+                        $cashdeskRef = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '121']);
+                        $cashdeskRow->setRef($cashdeskRef);
+                        $cashdeskRow->setCashdesk($entityManager->getRepository(Cashdesk::class)->find($payment['cashdesk']));
+                        $entityManager->persist($cashdeskRow);
+                    } elseif ($payment['type'] === 'salary') {
+                        // دریافت از طریق تنخواه گردان
+                        $salaryRow = new HesabdariRow();
+                        $salaryRow->setDes($payment['description'] ?? 'دریافت وجه فاکتور فروش شماره ' . $doc->getCode());
+                        $salaryRow->setBid($acc['bid']);
+                        $salaryRow->setYear($acc['year']);
+                        $salaryRow->setDoc($paymentDoc);
+                        $salaryRow->setBs(0);
+                        $salaryRow->setBd($payment['amount']);
+                        $salaryRef = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '122']);
+                        $salaryRow->setRef($salaryRef);
+                        $salaryRow->setSalary($entityManager->getRepository(Salary::class)->find($payment['salary']));
+                        $entityManager->persist($salaryRow);
+                    }
+
+                    // ایجاد سطر دریافت از مشتری
+                    $receiveRow = new HesabdariRow();
+                    $receiveRow->setDes($payment['description'] ?? 'پرداخت وجه فاکتور فروش شماره ' . $doc->getCode());
+                    $receiveRow->setBid($acc['bid']);
+                    $receiveRow->setYear($acc['year']);
+                    $receiveRow->setDoc($paymentDoc);
+                    $receiveRow->setBs($payment['amount']);
+                    $receiveRow->setBd(0);
+                    $receiveRef = $entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '3']);
+                    $receiveRow->setRef($receiveRef);
+                    $receiveRow->setPerson($person);
+                    $entityManager->persist($receiveRow);
+
+                    $entityManager->persist($paymentDoc);
+                }
+                $entityManager->flush();
+            }
+
+            // ثبت لاگ
+            $log->insert(
+                'حسابداری',
+                'سند حسابداری شماره ' . $doc->getCode() . ' ثبت / ویرایش شد.',
+                $this->getUser(),
+                $request->headers->get('activeBid'),
+                $doc
+            );
+
+            // ارسال پیامک اگر درخواست شده باشد
+            if (!empty($params['sendSmsToCustomer']) && $params['sendSmsToCustomer']) {
+                if ($pluginService->isActive('accpro', $acc['bid']) && $person->getMobile() != '' && $acc['bid']->getTel()) {
+                    $SMS->sendByBalance(
+                        [$person->getnikename(), 'sell/' . $acc['bid']->getId() . '/' . $doc->getShortlink(), $acc['bid']->getName(), $acc['bid']->getTel()],
+                        $registryMGR->get('sms', 'plugAccproSharefaktor'),
+                        $person->getMobile(),
+                        $acc['bid'],
+                        $this->getUser(),
+                        3
+                    );
+                } else {
+                    $SMS->sendByBalance(
+                        [$acc['bid']->getName(), 'sell/' . $acc['bid']->getId() . '/' . $doc->getShortlink()],
+                        $registryMGR->get('sms', 'sharefaktor'),
+                        $person->getMobile(),
+                        $acc['bid'],
+                        $this->getUser(),
+                        3
+                    );
+                }
+            }
+
+            return $this->json([
+                'result' => 1,
+                'message' => 'فاکتور با موفقیت ثبت شد',
+                'data' => [
+                    'id' => $doc->getCode(),
+                    'code' => $doc->getCode(),
+                    'shortlink' => $doc->getShortlink()
+                ]
+            ]);
+
+        } catch (\Exception $e) {
+            return $this->json([
+                'result' => 0,
+                'message' => $e->getMessage()
+            ]);
+        }
+    }
+
+    #[Route('/api/sell/v2/get/{id}', name: 'app_sell_v2_get', methods: ['GET'])]
+    public function app_sell_v2_get(
+        Request $request,
+        Access $access,
+        EntityManagerInterface $entityManager,
+        string $id
+    ): JsonResponse {
+        try {
+            $acc = $access->hasRole('sell');
+            if (!$acc) {
+                throw $this->createAccessDeniedException();
+            }
+
+            $doc = $entityManager->getRepository(HesabdariDoc::class)->findOneBy([
+                'bid' => $acc['bid'],
+                'year' => $acc['year'],
+                'code' => $id,
+                'money' => $acc['money']
+            ]);
+
+            if (!$doc) {
+                throw $this->createNotFoundException('فاکتور یافت نشد');
+            }
+
+            $person = null;
+            $discountAll = 0;
+            $transferCost = 0;
+            $items = [];
+            $totalInvoice = 0;
+            $taxPercent = $doc->getTaxPercent();
+            $discountType = $doc->getDiscountType() ?? 'fixed';
+            $discountPercent = $doc->getDiscountPercent() ?? 0;
+            $payments = [];
+
+            // دریافت اسناد پرداخت مرتبط
+            $relatedDocs = $doc->getRelatedDocs();
+            
+            foreach ($relatedDocs as $relatedDoc) {
+                if ($relatedDoc->getType() === 'sell_receive') {
+                    $payment = [
+                        'type' => null,
+                        'amount' => $relatedDoc->getAmount(),
+                        'reference' => '',
+                        'description' => $relatedDoc->getDes(),
+                        'bank' => null,
+                        'cashdesk' => null,
+                        'salary' => null
+                    ];
+
+                    foreach ($relatedDoc->getHesabdariRows() as $row) {
+                        if ($row->getBank()) {
+                            $payment['type'] = 'bank';
+                            $payment['bank'] = $row->getBank()->getId();
+                        } elseif ($row->getCashdesk()) {
+                            $payment['type'] = 'cashdesk';
+                            $payment['cashdesk'] = $row->getCashdesk()->getId();
+                        } elseif ($row->getSalary()) {
+                            $payment['type'] = 'salary';
+                            $payment['salary'] = $row->getSalary()->getId();
+                        }
+                    }
+
+                    $payments[] = $payment;
+                }
+            }
+
+            foreach ($doc->getHesabdariRows() as $row) {
+                if ($row->getPerson()) {
+                    $person = $row->getPerson();
+                } elseif ($row->getRef() && $row->getRef()->getCode() == '104') {
+                    $discountAll = $row->getBd();
+                } elseif ($row->getRef() && $row->getRef()->getCode() == '61') {
+                    $transferCost = $row->getBs();
+                } elseif ($row->getCommodity()) {
+                    $basePrice = $row->getBs();
+                    $itemDiscount = $row->getDiscount() ?? 0;
+                    $itemDiscountType = $row->getDiscountType() ?? 'fixed';
+                    $itemDiscountPercent = $row->getDiscountPercent() ?? 0;
+                    
+                    // محاسبه تخفیف سطری
+                    if ($itemDiscountType === 'percent') {
+                        $itemDiscount = round(($basePrice * $itemDiscountPercent) / 100);
+                    }
+                    
+                    $itemTotal = $basePrice - $itemDiscount;
+                    $totalInvoice += $itemTotal;
+                    
+                    $items[] = [
+                        'name' => [
+                            'id' => $row->getCommodity()->getId(),
+                            'name' => $row->getCommodity()->getName(),
+                            'code' => $row->getCommodity()->getCode()
+                        ],
+                        'count' => $row->getCommdityCount(),
+                        'price' => $row->getCommdityCount() > 0 ? $basePrice / $row->getCommdityCount() : 0,
+                        'discountPercent' => $itemDiscountPercent,
+                        'discountAmount' => $itemDiscount,
+                        'total' => $itemTotal,
+                        'description' => $row->getDes(),
+                        'showPercentDiscount' => $itemDiscountType === 'percent',
+                        'tax' => $row->getTax() ?? 0
+                    ];
+                }
+            }
+
+            // محاسبه تخفیف کلی از HesabdariDoc
+            $totalDiscount = 0;
+            if ($discountType === 'percent') {
+                $totalDiscount = round(($totalInvoice * $discountPercent) / 100);
+            } else {
+                $totalDiscount = $discountAll;
+            }
+
+            return $this->json([
+                'result' => 1,
+                'data' => [
+                    'id' => $doc->getCode(),
+                    'date' => $doc->getDate(),
+                    'person' => $person ? [
+                        'id' => $person->getId(),
+                        'name' => $person->getNikename(),
+                        'code' => $person->getCode()
+                    ] : null,
+                    'des' => $doc->getDes(),
+                    'totalInvoice' => $totalInvoice,
+                    'taxPercent' => $taxPercent,
+                    'discountType' => $discountType,
+                    'discountPercent' => $discountPercent,
+                    'totalDiscount' => $totalDiscount,
+                    'shippingCost' => $transferCost,
+                    'showTotalPercentDiscount' => $discountType === 'percent',
+                    'items' => $items,
+                    'finalTotal' => $doc->getAmount(),
+                    'payments' => $payments
+                ]
+            ]);
+
+        } catch (\Exception $e) {
+            return $this->json([
+                'result' => 0,
+                'message' => $e->getMessage()
+            ]);
+        }
+    }
 }
\ No newline at end of file
diff --git a/hesabixCore/src/Controller/System/DatabaseController.php b/hesabixCore/src/Controller/System/DatabaseController.php
new file mode 100644
index 0000000..05d565c
--- /dev/null
+++ b/hesabixCore/src/Controller/System/DatabaseController.php
@@ -0,0 +1,255 @@
+<?php
+
+namespace App\Controller\System;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Attribute\Route;
+use Doctrine\ORM\EntityManagerInterface;
+use App\Service\registryMGR;
+
+final class DatabaseController extends AbstractController
+{
+    private string $backupPath;
+    private registryMGR $registryMGR;
+    private EntityManagerInterface $entityManager;
+
+    public function __construct(registryMGR $registryMGR, EntityManagerInterface $entityManager)
+    {
+        $this->registryMGR = $registryMGR;
+        $this->entityManager = $entityManager;
+        $this->backupPath = dirname(__DIR__, 2) . '/hesabixBackup/versions';
+    }
+
+    #[Route('/api/admin/database/backup/info', name: 'app_admin_database_backup_info', methods: ['GET'])]
+    public function getBackupInfo(): JsonResponse
+    {
+        try {
+            $lastBackup = $this->getLastBackupInfo('local');
+            $lastFtpBackup = $this->getLastBackupInfo('ftp');
+
+            return $this->json([
+                'result' => 1,
+                'lastBackup' => $lastBackup,
+                'lastFtpBackup' => $lastFtpBackup
+            ]);
+        } catch (\Exception $e) {
+            return $this->json([
+                'result' => 0,
+                'message' => 'خطا در دریافت اطلاعات پشتیبان: ' . $e->getMessage()
+            ], 500);
+        }
+    }
+
+    #[Route('/api/admin/database/backup/create', name: 'app_admin_database_backup_create', methods: ['POST'])]
+    public function app_admin_database_backup_create(): JsonResponse
+    {
+        try {
+            // ایجاد پوشه‌های مورد نیاز
+            $this->ensureBackupDirectoriesExist();
+
+            // ایجاد نام فایل با timestamp
+            $filename = 'Hesabix-' . time() . '.sql';
+            $filepath = $this->backupPath . '/' . $filename;
+
+            // دریافت تنظیمات دیتابیس از EntityManager
+            $connection = $this->entityManager->getConnection();
+            $params = $connection->getParams();
+            
+            $dbName = $params['dbname'];
+            $dbUser = $params['user'];
+            $dbPass = $params['password'];
+            $dbHost = $params['host'];
+            $dbPort = $params['port'] ?? '3306';
+
+            // دستور mysqldump
+            $command = sprintf(
+                'mysqldump -h %s -P %s -u %s -p%s %s > %s',
+                escapeshellarg($dbHost),
+                escapeshellarg($dbPort),
+                escapeshellarg($dbUser),
+                escapeshellarg($dbPass),
+                escapeshellarg($dbName),
+                escapeshellarg($filepath)
+            );
+
+            // اجرای دستور
+            exec($command, $output, $returnVar);
+
+            if ($returnVar !== 0) {
+                throw new \Exception('خطا در اجرای دستور mysqldump: ' . implode("\n", $output));
+            }
+
+            // ذخیره اطلاعات آخرین پشتیبان
+            $this->updateLastBackupInfo('local', $filename);
+
+            return $this->json([
+                'result' => 1,
+                'filename' => $filename,
+                'message' => 'پشتیبان با موفقیت ایجاد شد'
+            ]);
+        } catch (\Exception $e) {
+        return $this->json([
+            'result' => 0,
+                'message' => 'خطا در ایجاد پشتیبان: ' . $e->getMessage()
+            ], 500);
+        }
+    }
+
+    #[Route('/api/admin/database/backup/create-and-upload', name: 'app_admin_database_backup_create_and_upload', methods: ['POST'])]
+    public function createAndUploadToFtp(): JsonResponse
+    {
+        try {
+            // ایجاد پشتیبان محلی
+            $backupResponse = $this->app_admin_database_backup_create();
+            $backupData = json_decode($backupResponse->getContent(), true);
+
+            if ($backupData['result'] !== 1) {
+                throw new \Exception($backupData['message']);
+            }
+
+            $filename = $backupData['filename'];
+            $filepath = $this->backupPath . '/' . $filename;
+
+            // بررسی وجود فایل و دسترسی‌های آن
+            if (!file_exists($filepath)) {
+                throw new \Exception("فایل پشتیبان در مسیر {$filepath} یافت نشد");
+            }
+
+            if (!is_readable($filepath)) {
+                throw new \Exception("عدم دسترسی به فایل پشتیبان در مسیر {$filepath}");
+            }
+
+            // دریافت تنظیمات FTP
+            $ftpEnabled = filter_var($this->registryMGR->get('system_settings', 'ftp_enabled'), FILTER_VALIDATE_BOOLEAN);
+            if (!$ftpEnabled) {
+                throw new \Exception('اتصال FTP غیرفعال است');
+            }
+
+            $ftpHost = $this->registryMGR->get('system_settings', 'ftp_host');
+            $ftpPort = $this->registryMGR->get('system_settings', 'ftp_port');
+            $ftpUsername = $this->registryMGR->get('system_settings', 'ftp_username');
+            $ftpPassword = $this->registryMGR->get('system_settings', 'ftp_password');
+            $ftpPath = $this->registryMGR->get('system_settings', 'ftp_path');
+
+            // اتصال به FTP
+            $ftp = ftp_connect($ftpHost, (int)$ftpPort, 30);
+            if (!$ftp) {
+                throw new \Exception('خطا در اتصال به سرور FTP');
+            }
+
+            // ورود به FTP
+            if (!ftp_login($ftp, $ftpUsername, $ftpPassword)) {
+                ftp_close($ftp);
+                throw new \Exception('خطا در ورود به سرور FTP');
+            }
+
+            // فعال کردن حالت غیرفعال
+            ftp_pasv($ftp, true);
+
+            // دریافت مسیر home کاربر
+            $homeDir = ftp_pwd($ftp);
+            if ($homeDir === false) {
+                ftp_close($ftp);
+                throw new \Exception('خطا در دریافت مسیر home کاربر FTP');
+            }
+
+            // تنظیم مسیر نهایی نسبت به home
+            $remotePath = rtrim($homeDir, '/') . '/' . ltrim($ftpPath, '/') . '/' . $filename;
+            $remoteDir = dirname($remotePath);
+
+            // بررسی دسترسی نوشتن در مسیر
+            $testFile = 'test_' . time() . '.txt';
+            if (!@ftp_put($ftp, $testFile, 'test', FTP_ASCII)) {
+                ftp_close($ftp);
+                throw new \Exception('کاربر FTP دسترسی نوشتن ندارد');
+            }
+            ftp_delete($ftp, $testFile);
+
+            // ایجاد مسیر در صورت عدم وجود
+            $this->createFtpDirectory($ftp, $remoteDir);
+
+            // تغییر به مسیر مورد نظر
+            if (!@ftp_chdir($ftp, $remoteDir)) {
+                ftp_close($ftp);
+                throw new \Exception("خطا در تغییر به مسیر {$remoteDir} در سرور FTP");
+            }
+
+            // آپلود فایل
+            if (!ftp_put($ftp, basename($remotePath), $filepath, FTP_BINARY)) {
+                $error = error_get_last();
+                ftp_close($ftp);
+                throw new \Exception('خطا در آپلود فایل به سرور FTP: ' . ($error['message'] ?? 'خطای نامشخص'));
+            }
+
+            ftp_close($ftp);
+
+            // ذخیره اطلاعات آخرین پشتیبان FTP
+            $this->updateLastBackupInfo('ftp', $filename);
+
+            return $this->json([
+                'result' => 1,
+                'filename' => $filename,
+                'message' => 'پشتیبان با موفقیت ایجاد و به سرور FTP ارسال شد'
+            ]);
+        } catch (\Exception $e) {
+            return $this->json([
+                'result' => 0,
+                'message' => 'خطا در ایجاد و ارسال پشتیبان: ' . $e->getMessage()
+            ], 500);
+        }
+    }
+
+    private function ensureBackupDirectoriesExist(): void
+    {
+        $directories = [
+            dirname($this->backupPath),
+            $this->backupPath
+        ];
+
+        foreach ($directories as $dir) {
+            if (!file_exists($dir)) {
+                if (!mkdir($dir, 0755, true)) {
+                    throw new \Exception("خطا در ایجاد پوشه {$dir}");
+                }
+            }
+        }
+    }
+
+    private function getLastBackupInfo(string $type): ?string
+    {
+        $key = $type === 'ftp' ? 'last_ftp_backup' : 'last_backup';
+        return $this->registryMGR->get('system_settings', $key);
+    }
+
+    private function updateLastBackupInfo(string $type, string $filename): void
+    {
+        $key = $type === 'ftp' ? 'last_ftp_backup' : 'last_backup';
+        $this->registryMGR->update('system_settings', $key, $filename);
+    }
+
+    private function createFtpDirectory($ftp, $dir): void
+    {
+        // اگر مسیر ریشه است، نیازی به ایجاد نیست
+        if ($dir === '/' || $dir === '.') {
+            return;
+        }
+
+        // بررسی وجود مسیر
+        if (@ftp_chdir($ftp, $dir)) {
+            ftp_chdir($ftp, '/');
+            return;
+        }
+
+        // ایجاد مسیر والد
+        $parent = dirname($dir);
+        $this->createFtpDirectory($ftp, $parent);
+
+        // ایجاد مسیر فعلی
+        $folder = basename($dir);
+        if (!@ftp_mkdir($ftp, $folder)) {
+            throw new \Exception("خطا در ایجاد پوشه {$folder} در سرور FTP. لطفاً دسترسی‌های کاربر FTP را بررسی کنید.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/hesabixCore/src/Controller/System/RegistrySettingsController.php b/hesabixCore/src/Controller/System/RegistrySettingsController.php
index 69550ba..7151a85 100644
--- a/hesabixCore/src/Controller/System/RegistrySettingsController.php
+++ b/hesabixCore/src/Controller/System/RegistrySettingsController.php
@@ -57,6 +57,13 @@ final class RegistrySettingsController extends AbstractController
             'appUrl' => $registryMGR->get('system', 'appUrl'),
             'appSlogan' => $registryMGR->get('system', 'appSlogan'),
             'verifyMobileViaSms' => filter_var($registryMGR->get('system', 'verifyMobileViaSms'), FILTER_VALIDATE_BOOLEAN),
+            // تنظیمات FTP
+            'ftpEnabled' => filter_var($registryMGR->get($rootSystem, 'ftp_enabled'), FILTER_VALIDATE_BOOLEAN),
+            'ftpHost' => $registryMGR->get($rootSystem, 'ftp_host') ?: '',
+            'ftpPort' => $registryMGR->get($rootSystem, 'ftp_port') ?: '21',
+            'ftpUsername' => $registryMGR->get($rootSystem, 'ftp_username') ?: '',
+            'ftpPassword' => $registryMGR->get($rootSystem, 'ftp_password') ?: '',
+            'ftpPath' => $registryMGR->get($rootSystem, 'ftp_path') ?: '',
         ];
 
         return new JsonResponse([
@@ -89,10 +96,86 @@ final class RegistrySettingsController extends AbstractController
         $registryMGR->update('system', 'appUrl', $data['appUrl'] ?? '');
         $registryMGR->update('system', 'appSlogan', $data['appSlogan'] ?? '');
         $registryMGR->update('system', 'verifyMobileViaSms', $data['verifyMobileViaSms'] ? '1' : '0');
+        // ذخیره تنظیمات FTP
+        $registryMGR->update($rootSystem, 'ftp_enabled', $data['ftpEnabled'] ? '1' : '0');
+        $registryMGR->update($rootSystem, 'ftp_host', $data['ftpHost'] ?? '');
+        $registryMGR->update($rootSystem, 'ftp_port', $data['ftpPort'] ?? '21');
+        $registryMGR->update($rootSystem, 'ftp_username', $data['ftpUsername'] ?? '');
+        $registryMGR->update($rootSystem, 'ftp_password', $data['ftpPassword'] ?? '');
+        $registryMGR->update($rootSystem, 'ftp_path', $data['ftpPath'] ?? '');
 
         return new JsonResponse([
             'result' => 1,
             'message' => 'Settings saved successfully'
         ]);
     }
+
+    #[Route('/api/admin/registry/settings/test-ftp', name: 'app_registry_settings_test_ftp', methods: ['POST'])]
+    public function testFtpConnection(Request $request): JsonResponse
+    {
+        try {
+            $data = json_decode($request->getContent(), true);
+            
+            // اعتبارسنجی داده‌های ورودی
+            $requiredFields = ['host', 'port', 'username', 'password', 'path'];
+            foreach ($requiredFields as $field) {
+                if (empty($data[$field])) {
+                    return $this->json([
+                        'success' => false,
+                        'message' => "فیلد {$field} الزامی است"
+                    ], 400);
+                }
+            }
+
+            // اعتبارسنجی پورت
+            $port = (int) $data['port'];
+            if ($port < 1 || $port > 65535) {
+                return $this->json([
+                    'success' => false,
+                    'message' => 'پورت باید عددی بین 1 تا 65535 باشد'
+                ], 400);
+            }
+
+            // ایجاد اتصال FTP
+            $ftp = ftp_connect($data['host'], $port, 30);
+            if (!$ftp) {
+                return $this->json([
+                    'success' => false,
+                    'message' => 'خطا در اتصال به سرور FTP'
+                ], 400);
+            }
+
+            // تلاش برای ورود
+            if (!ftp_login($ftp, $data['username'], $data['password'])) {
+                ftp_close($ftp);
+                return $this->json([
+                    'success' => false,
+                    'message' => 'نام کاربری یا رمز عبور اشتباه است'
+                ], 400);
+            }
+
+            // تست دسترسی به مسیر
+            if (!ftp_chdir($ftp, $data['path'])) {
+                ftp_close($ftp);
+                return $this->json([
+                    'success' => false,
+                    'message' => 'مسیر مورد نظر قابل دسترسی نیست'
+                ], 400);
+            }
+
+            // بستن اتصال
+            ftp_close($ftp);
+
+            return $this->json([
+                'success' => true,
+                'message' => 'اتصال به سرور FTP با موفقیت برقرار شد'
+            ]);
+
+        } catch (\Exception $e) {
+            return $this->json([
+                'success' => false,
+                'message' => 'خطا در تست اتصال: ' . $e->getMessage()
+            ], 500);
+        }
+    }
 }
\ No newline at end of file
diff --git a/hesabixCore/src/Entity/HesabdariDoc.php b/hesabixCore/src/Entity/HesabdariDoc.php
index cc90dd9..dc066e3 100644
--- a/hesabixCore/src/Entity/HesabdariDoc.php
+++ b/hesabixCore/src/Entity/HesabdariDoc.php
@@ -53,6 +53,9 @@ class HesabdariDoc
     #[ORM\Column(type: Types::DECIMAL, precision: 30, scale: 0, nullable: true)]
     private ?string $amount = '0';
 
+    #[ORM\Column(type: Types::FLOAT, nullable: true)]
+    private ?float $taxPercent = 0;
+
     #[ORM\ManyToOne]
     #[ORM\JoinColumn(nullable: false)]
     #[Ignore]
@@ -119,6 +122,12 @@ class HesabdariDoc
     #[ORM\JoinTable(name: 'pairDoc')]
     private Collection $pairDoc;
 
+    #[ORM\Column(length: 255, nullable: true)]
+    private ?string $discountType = null;
+
+    #[ORM\Column(type: Types::DECIMAL, precision: 10, scale: 2, nullable: true)]
+    private ?float $discountPercent = null;
+
     public function __construct()
     {
         $this->hesabdariRows = new ArrayCollection();
@@ -273,6 +282,17 @@ class HesabdariDoc
         return $this;
     }
 
+    public function getTaxPercent(): ?float
+    {
+        return $this->taxPercent;
+    }
+
+    public function setTaxPercent(?float $taxPercent): self
+    {
+        $this->taxPercent = $taxPercent;
+        return $this;
+    }
+
     public function getMoney(): ?Money
     {
         return $this->money;
@@ -572,4 +592,26 @@ class HesabdariDoc
 
         return $this;
     }
+
+    public function getDiscountType(): ?string
+    {
+        return $this->discountType;
+    }
+
+    public function setDiscountType(?string $discountType): static
+    {
+        $this->discountType = $discountType;
+        return $this;
+    }
+
+    public function getDiscountPercent(): ?float
+    {
+        return $this->discountPercent;
+    }
+
+    public function setDiscountPercent(?float $discountPercent): static
+    {
+        $this->discountPercent = $discountPercent;
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/hesabixCore/src/Entity/HesabdariRow.php b/hesabixCore/src/Entity/HesabdariRow.php
index 3044604..6e91683 100644
--- a/hesabixCore/src/Entity/HesabdariRow.php
+++ b/hesabixCore/src/Entity/HesabdariRow.php
@@ -91,6 +91,12 @@ class HesabdariRow
     #[ORM\Column(length: 255, nullable: true)]
     private ?string $tax = null;
 
+    #[ORM\Column(length: 20, nullable: true)]
+    private ?string $discountType = null;
+
+    #[ORM\Column(type: Types::DECIMAL, precision: 10, scale: 2, nullable: true)]
+    private ?float $discountPercent = null;
+
     public function __construct()
     {
     }
@@ -338,4 +344,28 @@ class HesabdariRow
 
         return $this;
     }
+
+    public function getDiscountType(): ?string
+    {
+        return $this->discountType;
+    }
+
+    public function setDiscountType(?string $discountType): self
+    {
+        $this->discountType = $discountType;
+
+        return $this;
+    }
+
+    public function getDiscountPercent(): ?float
+    {
+        return $this->discountPercent;
+    }
+
+    public function setDiscountPercent(?float $discountPercent): self
+    {
+        $this->discountPercent = $discountPercent;
+
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/hesabixCore/src/Service/Explore.php b/hesabixCore/src/Service/Explore.php
index 28c7a1b..79ad1e1 100644
--- a/hesabixCore/src/Service/Explore.php
+++ b/hesabixCore/src/Service/Explore.php
@@ -64,6 +64,8 @@ class Explore
                 $person = self::ExplorePerson($item->getPerson());
             } elseif ($item->getRef()->getCode() == '104') {
                 $result['discountAll'] = $item->getBd();
+                $result['discountType'] = $hesabdariDoc->getDiscountType();
+                $result['discountPercent'] = $hesabdariDoc->getDiscountPercent();
             } elseif ($item->getRef()->getCode() == '61') {
                 $result['transferCost'] = $item->getBs();
             }
@@ -72,6 +74,10 @@ class Explore
             $result['discountAll'] = 0;
         if (!array_key_exists('transferCost', $result))
             $result['transferCost'] = 0;
+        if (!array_key_exists('discountType', $result))
+            $result['discountType'] = 'fixed';
+        if (!array_key_exists('discountPercent', $result))
+            $result['discountPercent'] = null;
         $result['person'] = $person;
         $result['pair_docs'] = [];
         foreach ($hesabdariDoc->getPairDoc() as $pair) {
@@ -105,6 +111,8 @@ class Explore
                 $person = self::ExplorePerson($item->getPerson());
             } elseif ($item->getRef()->getCode() == '51') {
                 $result['discountAll'] = $item->getBs();
+                $result['discountType'] = $hesabdariDoc->getDiscountType();
+                $result['discountPercent'] = $hesabdariDoc->getDiscountPercent();
             } elseif ($item->getRef()->getCode() == '90') {
                 $result['transferCost'] = $item->getBd();
             }
@@ -113,6 +121,10 @@ class Explore
             $result['discountAll'] = 0;
         if (!array_key_exists('transferCost', $result))
             $result['transferCost'] = 0;
+        if (!array_key_exists('discountType', $result))
+            $result['discountType'] = 'fixed';
+        if (!array_key_exists('discountPercent', $result))
+            $result['discountPercent'] = null;
         $result['person'] = $person;
         return $result;
     }
@@ -126,9 +138,20 @@ class Explore
                 $person = self::ExplorePerson($item->getPerson());
             } elseif ($item->getCommodity()) {
                 $commodities[] = Explore::ExploreCommodity($item->getCommodity(), $item->getCommdityCount(), $item->getDes());
+            } elseif ($item->getRef()->getCode() == '104') {
+                $result['discountAll'] = $item->getBs();
+                $result['discountType'] = $hesabdariDoc->getDiscountType();
+                $result['discountPercent'] = $hesabdariDoc->getDiscountPercent();
             }
         }
+        if (!array_key_exists('discountAll', $result))
+            $result['discountAll'] = 0;
+        if (!array_key_exists('discountType', $result))
+            $result['discountType'] = 'fixed';
+        if (!array_key_exists('discountPercent', $result))
+            $result['discountPercent'] = null;
         $result['person'] = $person;
+        $result['commodities'] = $commodities;
         return $result;
     }
     public static function ExploreHesabdariDoc(HesabdariDoc $doc)
diff --git a/install.sh b/install.sh
index 0dc6f7f..b1a08aa 100644
--- a/install.sh
+++ b/install.sh
@@ -35,26 +35,26 @@ print_header() {
     echo -e "${BOLD}${BLUE}           Hesabix Installation Script           ${NC}"
     echo -e "${BOLD}${BLUE}=================================================${NC}"
     echo -e "${YELLOW}Hesabix is a powerful open-source accounting software${NC}"
-    echo -e "${YELLOW}developed with ❤ by Babak Alizadeh (alizadeh.babak)${NC}"
+    echo -e "${YELLOW}developed with ā¯¤ by Babak Alizadeh (alizadeh.babak)${NC}"
     echo -e "${YELLOW}License: GNU GPL v3${NC}"
     echo -e "${YELLOW}Website: ${UNDERLINE}https://hesabix.ir${NC}"
-    echo -e "${YELLOW}Support us: ${UNDERLINE}https://hesabix.ir/page/sponsors${NC} ❤"
+    echo -e "${YELLOW}Support us: ${UNDERLINE}https://hesabix.ir/page/sponsors${NC} ā¯¤"
     echo -e "${BOLD}${BLUE}=================================================${NC}\n"
     
     # Show prerequisites
     echo -e "${BOLD}${YELLOW}Prerequisites:${NC}"
     echo -e "1. A domain name pointing to this server"
     echo -e "2. DNS records properly configured:"
-    echo -e "   • A record pointing to server IP"
-    echo -e "   • www subdomain pointing to server IP"
+    echo -e "   ā€¢ A record pointing to server IP"
+    echo -e "   ā€¢ www subdomain pointing to server IP"
     echo -e "3. Port 80 and 443 open and accessible"
     echo -e "4. At least 2GB of free disk space"
     echo -e "5. At least 1GB of RAM"
     echo -e "\n${BOLD}${YELLOW}Important Notes:${NC}"
-    echo -e "• SSL certificate installation requires proper DNS configuration"
-    echo -e "• Domain must be accessible from the internet"
-    echo -e "• Installation may take 10-15 minutes"
-    echo -e "• System will be automatically rolled back if installation fails"
+    echo -e "ā€¢ SSL certificate installation requires proper DNS configuration"
+    echo -e "ā€¢ Domain must be accessible from the internet"
+    echo -e "ā€¢ Installation may take 10-15 minutes"
+    echo -e "ā€¢ System will be automatically rolled back if installation fails"
     echo -e "\n${BOLD}${YELLOW}Do you want to continue?${NC}"
     read -p "Press Enter to continue or Ctrl+C to abort..."
     echo -e "${BOLD}${BLUE}=================================================${NC}\n"
@@ -487,7 +487,7 @@ setup_ssl() {
         echo -e "2. Domain is pointing to this server's IP address"
         echo -e "3. Port 80 is accessible from the internet"
         echo -e "\n${YELLOW}You can run SSL setup later using:${NC}"
-        echo -e "${GREEN}sudo certbot --apache -d $domain -d www.$domain${NC}"
+        echo -e "${GREEN}sudo certbot --apache -d $domain${NC}"
         return 1
     fi
     
@@ -504,7 +504,7 @@ setup_ssl() {
     if ! systemctl is-active --quiet apache2; then
         log_message "ERROR" "Apache is not running. Please start Apache first."
         return 1
-    }
+    fi
     
     # Try to setup SSL with multiple attempts
     while [[ $attempt -le $max_attempts ]] && [[ $success == false ]]; do
@@ -515,8 +515,8 @@ setup_ssl() {
             log_message "WARNING" "Failed to stop Apache, continuing anyway..."
         }
         
-        # Run certbot
-        if certbot --apache -d "$domain" -d "www.$domain" --non-interactive --agree-tos --email "admin@$domain" --force-renewal; then
+        # Run certbot only for main domain
+        if certbot --apache -d "$domain" --non-interactive --agree-tos --email "admin@$domain" --force-renewal; then
             success=true
             log_message "INFO" "SSL setup completed successfully"
         else
@@ -550,10 +550,10 @@ setup_ssl() {
         echo -e "2. Port 80 is blocked by firewall"
         echo -e "3. Let's Encrypt rate limit exceeded"
         echo -e "\n${YELLOW}You can try setting up SSL manually using:${NC}"
-        echo -e "${GREEN}sudo certbot --apache -d $domain -d www.$domain${NC}"
+        echo -e "${GREEN}sudo certbot --apache -d $domain${NC}"
         echo -e "\n${YELLOW}Or check the logs:${NC}"
         echo -e "${GREEN}sudo certbot certificates${NC}"
-        echo -e "${GREEN}sudo certbot --apache -d $domain -d www.$domain --dry-run${NC}"
+        echo -e "${GREEN}sudo certbot --apache -d $domain --dry-run${NC}"
         return 1
     fi
 }
@@ -656,7 +656,8 @@ setup_database() {
     local db_name="$base_db_name"
     local db_user="hesabix_user"
     local db_password
-    db_password=$(openssl rand -base64 12)
+    # Generate password with only alphanumeric characters
+    db_password=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 12 | head -n 1)
     local domain_path="/var/www/html/$domain"
     local counter=1
     
@@ -868,31 +869,33 @@ setup_web_ui() {
     
     cd "$webui_path" || handle_error "Failed to change to webUI directory"
     
+    # Set initial permissions for npm operations
+    chown -R "$SUDO_USER:$SUDO_USER" "$webui_path"
+    chmod -R 777 "$webui_path"
+    
     # Install dependencies
     log_message "INFO" "Installing web UI dependencies..."
     timeout "$NPM_TIMEOUT" npm install || handle_error "Failed to install web UI dependencies"
     
-    # Set proper permissions for webUI directory
-    log_message "INFO" "Setting proper permissions for webUI directory..."
-    chown -R "$apache_user:$apache_user" "$webui_path"
-    chmod -R 755 "$webui_path"
-    
-    # Set execute permissions for node_modules/.bin
-    if [[ -d "$webui_path/node_modules/.bin" ]]; then
-        chmod -R +x "$webui_path/node_modules/.bin"
-    fi
-    
-    # Set proper permissions for node_modules
-    log_message "INFO" "Setting proper permissions for node_modules directory..."
-    chmod -R 755 "$webui_path/node_modules"
-    find "$webui_path/node_modules" -type f -exec chmod 644 {} \;
-    find "$webui_path/node_modules" -type d -exec chmod 755 {} \;
-    find "$webui_path/node_modules/.bin" -type f -exec chmod 755 {} \;
-    
     # Build web UI
     log_message "INFO" "Building web UI..."
     timeout "$NPM_TIMEOUT" npm run build-only || handle_error "Failed to build web UI"
     
+    # After build, set final ownership to apache
+    chown -R "$apache_user:$apache_user" "$webui_path"
+    
+    # Set final permissions
+    find "$webui_path" -type d -exec chmod 755 {} \;
+    find "$webui_path" -type f -exec chmod 644 {} \;
+    
+    # Set special permissions for node_modules
+    if [[ -d "$webui_path/node_modules" ]]; then
+        chmod -R 755 "$webui_path/node_modules"
+        find "$webui_path/node_modules" -type f -exec chmod 644 {} \;
+        find "$webui_path/node_modules" -type d -exec chmod 755 {} \;
+        find "$webui_path/node_modules/.bin" -type f -exec chmod 755 {} \;
+    fi
+    
     log_message "INFO" "Web UI setup completed"
 }
 
@@ -950,14 +953,14 @@ confirm_installation() {
     echo -e "${BOLD}${BLUE}           Installation Confirmation           ${NC}"
     echo -e "${BOLD}${BLUE}=================================================${NC}"
     echo -e "${YELLOW}This script will install:${NC}"
-    echo -e "• PHP and required extensions"
-    echo -e "• MySQL/MariaDB"
-    echo -e "• Apache"
-    echo -e "• Node.js"
-    echo -e "• Composer"
-    echo -e "• phpMyAdmin"
-    echo -e "• Hesabix Core"
-    echo -e "• Hesabix Web UI"
+    echo -e "ā€¢ PHP and required extensions"
+    echo -e "ā€¢ MySQL/MariaDB"
+    echo -e "ā€¢ Apache"
+    echo -e "ā€¢ Node.js"
+    echo -e "ā€¢ Composer"
+    echo -e "ā€¢ phpMyAdmin"
+    echo -e "ā€¢ Hesabix Core"
+    echo -e "ā€¢ Hesabix Web UI"
     echo -e "\n${YELLOW}The installation will require approximately 2GB of disk space.${NC}"
     echo -e "${BOLD}${BLUE}=================================================${NC}\n"
     
@@ -1012,7 +1015,7 @@ show_installation_summary() {
     
     # Get database password from env file
     if [[ -f "$env_file" ]]; then
-        db_password=$(php -r "include '$env_file'; echo \$env['DATABASE_URL']; echo PHP_EOL;" | grep -oP '(?<=://[^:]+:)[^@]+(?=@)')
+        db_password=$(php -r "include '$env_file'; echo \$env['DATABASE_URL']; echo PHP_EOL;" | sed -n 's/.*:\/\/[^:]*:\([^@]*\)@.*/\1/p')
     fi
     
     log_message "INFO" "Showing installation summary..."
@@ -1047,7 +1050,7 @@ show_installation_summary() {
         echo -e "\n${YELLOW}To get database information, you can:${NC}"
         echo -e "1. Check the file: $env_file"
         echo -e "2. Run this command to extract password:"
-        echo -e "   ${GREEN}php -r \"include '$env_file'; echo \$env['DATABASE_URL']; echo PHP_EOL;\" | grep -oP '(?<=://[^:]+:)[^@]+(?=@)'${NC}"
+        echo -e "   ${GREEN}php -r \"include '$env_file'; echo \$env['DATABASE_URL']; echo PHP_EOL;\" | sed -n 's/.*:\/\/[^:]*:\\([^@]*\\)@.*/\\1/p'${NC}"
         echo -e "3. Or check MySQL directly:"
         echo -e "   ${GREEN}mysql -u root -e \"SELECT User, Host FROM mysql.user WHERE User='$db_user';\"${NC}"
     fi
@@ -1068,10 +1071,10 @@ show_installation_summary() {
     echo -e "4. Register the first user (system administrator)"
     
     echo -e "\n${YELLOW}Support:${NC}"
-    echo -e "• Developer: Babak Alizadeh (alizadeh.babak)"
-    echo -e "• License: GNU GPL v3"
-    echo -e "• Website: ${UNDERLINE}https://hesabix.ir${NC}"
-    echo -e "• Support us: ${UNDERLINE}https://hesabix.ir/page/sponsors${NC} ❤"
+    echo -e "ā€¢ Developer: Babak Alizadeh (alizadeh.babak)"
+    echo -e "ā€¢ License: GNU GPL v3"
+    echo -e "ā€¢ Website: ${UNDERLINE}https://hesabix.ir${NC}"
+    echo -e "ā€¢ Support us: ${UNDERLINE}https://hesabix.ir/page/sponsors${NC} ā¯¤"
     
     echo -e "\n${GREEN}Installation completed successfully!${NC}"
     echo -e "${BOLD}${BLUE}=================================================${NC}"
@@ -1087,9 +1090,9 @@ display_telemetry_consent() {
     echo -e "${RED}           Anonymous Data Collection           "
     echo -e "${RED}================================================="
     echo -e "${BLUE}To improve Hesabix, we would like to collect anonymous data:"
-    echo -e "${BLUE}• System information (OS, PHP, MySQL versions)"
-    echo -e "${BLUE}• Installation path and domain"
-    echo -e "${BLUE}• Installation date"
+    echo -e "${BLUE}ā€¢ System information (OS, PHP, MySQL versions)"
+    echo -e "${BLUE}ā€¢ Installation path and domain"
+    echo -e "${BLUE}ā€¢ Installation date"
     
     read -p "Do you agree? (y/n) [n]: " response
     [[ "$response" =~ ^[Yy]$ ]] && SEND_TELEMETRY=true
diff --git a/webUI/.gitignore b/webUI/.gitignore
old mode 100755
new mode 100644
diff --git a/webUI/LICENSE b/webUI/LICENSE
old mode 100755
new mode 100644
diff --git a/webUI/env.d.ts b/webUI/env.d.ts
old mode 100755
new mode 100644
diff --git a/webUI/index.html b/webUI/index.html
old mode 100755
new mode 100644
diff --git a/webUI/package.json b/webUI/package.json
old mode 100755
new mode 100644
diff --git a/webUI/public/.htaccess b/webUI/public/.htaccess
old mode 100755
new mode 100644
diff --git a/webUI/public/dashmix/dashmix.app.min.js b/webUI/public/dashmix/dashmix.app.min.js
old mode 100755
new mode 100644
diff --git a/webUI/public/dashmix/dashmix.min.css b/webUI/public/dashmix/dashmix.min.css
old mode 100755
new mode 100644
diff --git a/webUI/public/favicon.ico b/webUI/public/favicon.ico
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/fontawesome/fa-brands-400.ttf b/webUI/public/fonts/fontawesome/fa-brands-400.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/fontawesome/fa-brands-400.woff2 b/webUI/public/fonts/fontawesome/fa-brands-400.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/fontawesome/fa-regular-400.ttf b/webUI/public/fonts/fontawesome/fa-regular-400.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/fontawesome/fa-regular-400.woff2 b/webUI/public/fonts/fontawesome/fa-regular-400.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/fontawesome/fa-solid-900.ttf b/webUI/public/fonts/fontawesome/fa-solid-900.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/fontawesome/fa-solid-900.woff2 b/webUI/public/fonts/fontawesome/fa-solid-900.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/fontawesome/fa-v4compatibility.ttf b/webUI/public/fonts/fontawesome/fa-v4compatibility.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/fontawesome/fa-v4compatibility.woff2 b/webUI/public/fonts/fontawesome/fa-v4compatibility.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/inter/inter-v11-latin-300.woff2 b/webUI/public/fonts/inter/inter-v11-latin-300.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/inter/inter-v11-latin-500.woff2 b/webUI/public/fonts/inter/inter-v11-latin-500.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/inter/inter-v11-latin-600.woff2 b/webUI/public/fonts/inter/inter-v11-latin-600.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/inter/inter-v11-latin-700.woff2 b/webUI/public/fonts/inter/inter-v11-latin-700.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/inter/inter-v11-latin-800.woff2 b/webUI/public/fonts/inter/inter-v11-latin-800.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/inter/inter-v11-latin-900.woff2 b/webUI/public/fonts/inter/inter-v11-latin-900.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/inter/inter-v11-latin-regular.woff2 b/webUI/public/fonts/inter/inter-v11-latin-regular.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-Black-FD.eot b/webUI/public/fonts/sahel/Sahel-Black-FD.eot
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-Black-FD.ttf b/webUI/public/fonts/sahel/Sahel-Black-FD.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-Black-FD.woff b/webUI/public/fonts/sahel/Sahel-Black-FD.woff
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-Black-FD.woff2 b/webUI/public/fonts/sahel/Sahel-Black-FD.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-Bold-FD.eot b/webUI/public/fonts/sahel/Sahel-Bold-FD.eot
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-Bold-FD.ttf b/webUI/public/fonts/sahel/Sahel-Bold-FD.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-Bold-FD.woff b/webUI/public/fonts/sahel/Sahel-Bold-FD.woff
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-Bold-FD.woff2 b/webUI/public/fonts/sahel/Sahel-Bold-FD.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-FD.eot b/webUI/public/fonts/sahel/Sahel-FD.eot
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-FD.ttf b/webUI/public/fonts/sahel/Sahel-FD.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-FD.woff b/webUI/public/fonts/sahel/Sahel-FD.woff
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-FD.woff2 b/webUI/public/fonts/sahel/Sahel-FD.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-Light-FD.eot b/webUI/public/fonts/sahel/Sahel-Light-FD.eot
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-Light-FD.ttf b/webUI/public/fonts/sahel/Sahel-Light-FD.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-Light-FD.woff b/webUI/public/fonts/sahel/Sahel-Light-FD.woff
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-Light-FD.woff2 b/webUI/public/fonts/sahel/Sahel-Light-FD.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-SemiBold-FD.eot b/webUI/public/fonts/sahel/Sahel-SemiBold-FD.eot
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-SemiBold-FD.ttf b/webUI/public/fonts/sahel/Sahel-SemiBold-FD.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-SemiBold-FD.woff b/webUI/public/fonts/sahel/Sahel-SemiBold-FD.woff
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/Sahel-SemiBold-FD.woff2 b/webUI/public/fonts/sahel/Sahel-SemiBold-FD.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/sahel/sahel.css b/webUI/public/fonts/sahel/sahel.css
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Bold-FD.eot b/webUI/public/fonts/shabnam/Shabnam-Bold-FD.eot
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Bold-FD.ttf b/webUI/public/fonts/shabnam/Shabnam-Bold-FD.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Bold-FD.woff b/webUI/public/fonts/shabnam/Shabnam-Bold-FD.woff
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Bold-FD.woff2 b/webUI/public/fonts/shabnam/Shabnam-Bold-FD.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-FD.eot b/webUI/public/fonts/shabnam/Shabnam-FD.eot
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-FD.ttf b/webUI/public/fonts/shabnam/Shabnam-FD.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-FD.woff b/webUI/public/fonts/shabnam/Shabnam-FD.woff
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-FD.woff2 b/webUI/public/fonts/shabnam/Shabnam-FD.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Light-FD.eot b/webUI/public/fonts/shabnam/Shabnam-Light-FD.eot
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Light-FD.ttf b/webUI/public/fonts/shabnam/Shabnam-Light-FD.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Light-FD.woff b/webUI/public/fonts/shabnam/Shabnam-Light-FD.woff
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Light-FD.woff2 b/webUI/public/fonts/shabnam/Shabnam-Light-FD.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Medium-FD.eot b/webUI/public/fonts/shabnam/Shabnam-Medium-FD.eot
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Medium-FD.ttf b/webUI/public/fonts/shabnam/Shabnam-Medium-FD.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Medium-FD.woff b/webUI/public/fonts/shabnam/Shabnam-Medium-FD.woff
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Medium-FD.woff2 b/webUI/public/fonts/shabnam/Shabnam-Medium-FD.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Thin-FD.eot b/webUI/public/fonts/shabnam/Shabnam-Thin-FD.eot
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Thin-FD.ttf b/webUI/public/fonts/shabnam/Shabnam-Thin-FD.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Thin-FD.woff b/webUI/public/fonts/shabnam/Shabnam-Thin-FD.woff
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/Shabnam-Thin-FD.woff2 b/webUI/public/fonts/shabnam/Shabnam-Thin-FD.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/shabnam/shabnam.css b/webUI/public/fonts/shabnam/shabnam.css
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/simple-line-icons/Simple-Line-Icons.eot b/webUI/public/fonts/simple-line-icons/Simple-Line-Icons.eot
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/simple-line-icons/Simple-Line-Icons.svg b/webUI/public/fonts/simple-line-icons/Simple-Line-Icons.svg
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/simple-line-icons/Simple-Line-Icons.ttf b/webUI/public/fonts/simple-line-icons/Simple-Line-Icons.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/simple-line-icons/Simple-Line-Icons.woff b/webUI/public/fonts/simple-line-icons/Simple-Line-Icons.woff
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/simple-line-icons/Simple-Line-Icons.woff2 b/webUI/public/fonts/simple-line-icons/Simple-Line-Icons.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/ttf/Vazirmatn-Black.ttf b/webUI/public/fonts/vazir/ttf/Vazirmatn-Black.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/ttf/Vazirmatn-Bold.ttf b/webUI/public/fonts/vazir/ttf/Vazirmatn-Bold.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/ttf/Vazirmatn-ExtraBold.ttf b/webUI/public/fonts/vazir/ttf/Vazirmatn-ExtraBold.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/ttf/Vazirmatn-ExtraLight.ttf b/webUI/public/fonts/vazir/ttf/Vazirmatn-ExtraLight.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/ttf/Vazirmatn-Light.ttf b/webUI/public/fonts/vazir/ttf/Vazirmatn-Light.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/ttf/Vazirmatn-Medium.ttf b/webUI/public/fonts/vazir/ttf/Vazirmatn-Medium.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/ttf/Vazirmatn-Regular.ttf b/webUI/public/fonts/vazir/ttf/Vazirmatn-Regular.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/ttf/Vazirmatn-SemiBold.ttf b/webUI/public/fonts/vazir/ttf/Vazirmatn-SemiBold.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/ttf/Vazirmatn-Thin.ttf b/webUI/public/fonts/vazir/ttf/Vazirmatn-Thin.ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/variable/Vazirmatn[wght].ttf b/webUI/public/fonts/vazir/variable/Vazirmatn[wght].ttf
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/vazir.css b/webUI/public/fonts/vazir/vazir.css
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-Black.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-Black.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-Bold.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-Bold.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-ExtraBold.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-ExtraBold.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-ExtraLight.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-ExtraLight.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-Black.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-Black.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-Bold.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-Bold.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-ExtraBold.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-ExtraBold.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-ExtraLight.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-ExtraLight.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-Light.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-Light.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-Medium.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-Medium.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-Regular.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-Regular.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-SemiBold.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-SemiBold.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-Thin.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-FD-Thin.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-Light.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-Light.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-Medium.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-Medium.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-Regular.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-Regular.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-SemiBold.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-SemiBold.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn-Thin.woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn-Thin.woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/fonts/vazir/webfonts/Vazirmatn[wght].woff2 b/webUI/public/fonts/vazir/webfonts/Vazirmatn[wght].woff2
old mode 100755
new mode 100644
diff --git a/webUI/public/img/404.gif b/webUI/public/img/404.gif
old mode 100755
new mode 100644
diff --git a/webUI/public/img/android-chrome-192x192.png b/webUI/public/img/android-chrome-192x192.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/android-chrome-512x512.png b/webUI/public/img/android-chrome-512x512.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/apple-touch-icon.png b/webUI/public/img/apple-touch-icon.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/avatar.jpg b/webUI/public/img/avatar.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/avatar.png b/webUI/public/img/avatar.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/avatar.webp b/webUI/public/img/avatar.webp
old mode 100755
new mode 100644
diff --git a/webUI/public/img/banner1.jpg b/webUI/public/img/banner1.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/bg_side_overlay_header.jpg b/webUI/public/img/bg_side_overlay_header.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/cover.jpg b/webUI/public/img/cover.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/enamad-logo.png b/webUI/public/img/enamad-logo.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/favicon-16x16.png b/webUI/public/img/favicon-16x16.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/favicon-32x32.png b/webUI/public/img/favicon-32x32.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/favicon.ico b/webUI/public/img/favicon.ico
old mode 100755
new mode 100644
diff --git a/webUI/public/img/favicons/apple-touch-icon-180x180.png b/webUI/public/img/favicons/apple-touch-icon-180x180.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/favicons/favicon-192x192.png b/webUI/public/img/favicons/favicon-192x192.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/favicons/favicon.ico b/webUI/public/img/favicons/favicon.ico
old mode 100755
new mode 100644
diff --git a/webUI/public/img/favicons/favicon.png b/webUI/public/img/favicons/favicon.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/favicons/favw.png b/webUI/public/img/favicons/favw.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/favw.png b/webUI/public/img/favw.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/bale-logo.png b/webUI/public/img/icons/bale-logo.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/bank.jpg b/webUI/public/img/icons/bank.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/business.png b/webUI/public/img/icons/business.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/cashdesk.jpg b/webUI/public/img/icons/cashdesk.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/check.jpg b/webUI/public/img/icons/check.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/eitaa.jpeg b/webUI/public/img/icons/eitaa.jpeg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/melipayamak.png b/webUI/public/img/icons/melipayamak.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/robika.png b/webUI/public/img/icons/robika.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/salary.jpg b/webUI/public/img/icons/salary.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/telegram.png b/webUI/public/img/icons/telegram.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/wallet.png b/webUI/public/img/icons/wallet.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/warehouse.jpg b/webUI/public/img/icons/warehouse.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/icons/zarinpal.png b/webUI/public/img/icons/zarinpal.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/logo-blue.png b/webUI/public/img/logo-blue.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/logo/homescreen144.png b/webUI/public/img/logo/homescreen144.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/logo/homescreen168.png b/webUI/public/img/logo/homescreen168.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/logo/homescreen192.png b/webUI/public/img/logo/homescreen192.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/logo/homescreen256.png b/webUI/public/img/logo/homescreen256.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/logo/homescreen48.png b/webUI/public/img/logo/homescreen48.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/logo/homescreen512.png b/webUI/public/img/logo/homescreen512.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/logo/homescreen72.png b/webUI/public/img/logo/homescreen72.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/logo/homescreen96.png b/webUI/public/img/logo/homescreen96.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/logo/logo500.png b/webUI/public/img/logo/logo500.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/payways/pec.ir.png b/webUI/public/img/payways/pec.ir.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/payways/zarinpal-logo-min.png b/webUI/public/img/payways/zarinpal-logo-min.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/plugins/accpro.png b/webUI/public/img/plugins/accpro.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/plugins/accpro/intro.png b/webUI/public/img/plugins/accpro/intro.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/plugins/apartemanma.jpg b/webUI/public/img/plugins/apartemanma.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/plugins/apartemanma/drawer.jpg b/webUI/public/img/plugins/apartemanma/drawer.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/plugins/apartemanma/intro.jpg b/webUI/public/img/plugins/apartemanma/intro.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/plugins/club.webp b/webUI/public/img/plugins/club.webp
old mode 100755
new mode 100644
diff --git a/webUI/public/img/plugins/noghrekoob.jpeg b/webUI/public/img/plugins/noghrekoob.jpeg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/plugins/onlinestore.webp b/webUI/public/img/plugins/onlinestore.webp
old mode 100755
new mode 100644
diff --git a/webUI/public/img/plugins/onlinestore/intro.webp b/webUI/public/img/plugins/onlinestore/intro.webp
old mode 100755
new mode 100644
diff --git a/webUI/public/img/plugins/repservice.jpg b/webUI/public/img/plugins/repservice.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/plugins/repservice.png b/webUI/public/img/plugins/repservice.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/plugins/rest.jpg b/webUI/public/img/plugins/rest.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/sabavision.gif b/webUI/public/img/sabavision.gif
old mode 100755
new mode 100644
diff --git a/webUI/public/img/site.webmanifest b/webUI/public/img/site.webmanifest
old mode 100755
new mode 100644
diff --git a/webUI/public/img/whatsapp.png b/webUI/public/img/whatsapp.png
old mode 100755
new mode 100644
diff --git a/webUI/public/img/wp.jpg b/webUI/public/img/wp.jpg
old mode 100755
new mode 100644
diff --git a/webUI/public/img/zarinpal-logo-min.png b/webUI/public/img/zarinpal-logo-min.png
old mode 100755
new mode 100644
diff --git a/webUI/public/manifest.json b/webUI/public/manifest.json
old mode 100755
new mode 100644
diff --git a/webUI/public/service-worker.js b/webUI/public/service-worker.js
old mode 100755
new mode 100644
diff --git a/webUI/src/App.vue b/webUI/src/App.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/assets/dino.png b/webUI/src/assets/dino.png
old mode 100755
new mode 100644
diff --git a/webUI/src/assets/hero.png b/webUI/src/assets/hero.png
old mode 100755
new mode 100644
diff --git a/webUI/src/assets/logo.svg b/webUI/src/assets/logo.svg
old mode 100755
new mode 100644
diff --git a/webUI/src/assets/peach.png b/webUI/src/assets/peach.png
old mode 100755
new mode 100644
diff --git a/webUI/src/assets/site.css b/webUI/src/assets/site.css
old mode 100755
new mode 100644
diff --git a/webUI/src/components/ChangePasswordDialog.vue b/webUI/src/components/ChangePasswordDialog.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/Editor.vue b/webUI/src/components/Editor.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/PrintDialog.vue b/webUI/src/components/PrintDialog.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/application/buttons/CalculatorButton.vue b/webUI/src/components/application/buttons/CalculatorButton.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/application/buttons/SecretDialog.vue b/webUI/src/components/application/buttons/SecretDialog.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/application/buttons/change_lang.vue b/webUI/src/components/application/buttons/change_lang.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/application/buttons/notifications_btn.vue b/webUI/src/components/application/buttons/notifications_btn.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/application/buttons/profile_btn.vue b/webUI/src/components/application/buttons/profile_btn.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/application/clock.vue b/webUI/src/components/application/clock.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/application/combobox/currency_cob.vue b/webUI/src/components/application/combobox/currency_cob.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/application/combobox/year_cob.vue b/webUI/src/components/application/combobox/year_cob.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/application/list/archive_list.vue b/webUI/src/components/application/list/archive_list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/application/list/sms_list.vue b/webUI/src/components/application/list/sms_list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/forms/Haccountsearch.vue b/webUI/src/components/forms/Haccountsearch.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/forms/Hbankaccountsearch.vue b/webUI/src/components/forms/Hbankaccountsearch.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/forms/Hbankselect.vue b/webUI/src/components/forms/Hbankselect.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/forms/Hcashdesksearch.vue b/webUI/src/components/forms/Hcashdesksearch.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/forms/Hcommoditysearch.vue b/webUI/src/components/forms/Hcommoditysearch.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/forms/Hdatepicker.vue b/webUI/src/components/forms/Hdatepicker.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/forms/HesabdariTreeView.vue b/webUI/src/components/forms/HesabdariTreeView.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/forms/Hnumberinput.vue b/webUI/src/components/forms/Hnumberinput.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/forms/Hpersonsearch.vue b/webUI/src/components/forms/Hpersonsearch.vue
old mode 100755
new mode 100644
index 82ae6a2..a2ff5b3
--- a/webUI/src/components/forms/Hpersonsearch.vue
+++ b/webUI/src/components/forms/Hpersonsearch.vue
@@ -16,7 +16,7 @@
           :loading="loading"
           @keydown.enter="handleEnter"
           hide-details
-          density="compact"
+          density="comfortable"
           style="font-size: 0.7rem;"
         >
           <template v-slot:append-inner>
diff --git a/webUI/src/components/forms/Hsalarysearch.vue b/webUI/src/components/forms/Hsalarysearch.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/forms/Htabletreeselect.vue b/webUI/src/components/forms/Htabletreeselect.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/forms/TreeNode.vue b/webUI/src/components/forms/TreeNode.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/widgets/PrintOptions.vue b/webUI/src/components/widgets/PrintOptions.vue
old mode 100755
new mode 100644
index 10690e5..b879975
--- a/webUI/src/components/widgets/PrintOptions.vue
+++ b/webUI/src/components/widgets/PrintOptions.vue
@@ -17,6 +17,8 @@ export default defineComponent({
       taxInfo: true,
       discountInfo: true,
       paper: 'A4-L',
+      invoiceIndex: true,
+      businessStamp: true,
     },
   }),
   methods: {
@@ -99,30 +101,49 @@ export default defineComponent({
           label="اطلاعات کسب‌وکار"
           class="my-1"
           hide-details
+          color="primary"
         ></v-switch>
         <v-switch
           v-model="printOptions.pays"
           label="نمایش پرداخت‌های فاکتور"
           class="my-1"
           hide-details
+          color="primary"
         ></v-switch>
         <v-switch
           v-model="printOptions.note"
           label="یادداشت پایین فاکتور"
           class="my-1"
           hide-details
+          color="primary"
         ></v-switch>
         <v-switch
           v-model="printOptions.taxInfo"
           label="مالیات به تفکیک اقلام"
           class="my-1"
           hide-details
+          color="primary"
         ></v-switch>
         <v-switch
           v-model="printOptions.discountInfo"
           label="تخفیف به تفکیک اقلام"
           class="my-1"
           hide-details
+          color="primary"
+        ></v-switch>
+        <v-switch
+          v-model="printOptions.invoiceIndex"
+          label="نمایه فاکتور"
+          class="my-1"
+          hide-details
+          color="primary"
+        ></v-switch>
+        <v-switch
+          v-model="printOptions.businessStamp"
+          label="مهر کسب و کار"
+          class="my-1"
+          hide-details
+          color="primary"
         ></v-switch>
       </v-card-text>
     </v-card>
diff --git a/webUI/src/components/widgets/ShareOptions.vue b/webUI/src/components/widgets/ShareOptions.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/widgets/TopCommoditiesChart.vue b/webUI/src/components/widgets/TopCommoditiesChart.vue
old mode 100755
new mode 100644
index da2b068..4117d8f
--- a/webUI/src/components/widgets/TopCommoditiesChart.vue
+++ b/webUI/src/components/widgets/TopCommoditiesChart.vue
@@ -1,8 +1,71 @@
 <template>
-  <v-container fluid>
-    <!-- سوئیچ برای انتخاب نوع نمودار -->
-    <v-row dense justify="end">
-      <v-col cols="auto">
+  <v-card class="top-commodities-chart" elevation="0" variant="outlined">
+    <v-card-title class="d-flex align-center justify-space-between pa-4">
+      <span class="text-h6">{{ $t('dashboard.topCommodities.title') }}</span>
+      <div class="d-flex align-center gap-2">
+        <v-select
+          v-model="period"
+          :items="periodOptions"
+          :label="$t('dashboard.topCommodities.period')"
+          density="compact"
+          variant="outlined"
+          hide-details
+          class="period-select"
+          @update:modelValue="fetchData"
+        ></v-select>
+        <v-select
+          v-model="limit"
+          :items="limitOptions"
+          :label="$t('dashboard.topCommodities.limit')"
+          density="compact"
+          variant="outlined"
+          hide-details
+          class="limit-select"
+          @update:modelValue="fetchData"
+        ></v-select>
+      </div>
+    </v-card-title>
+
+    <v-card-text class="pa-4">
+      <div class="d-flex justify-end mb-4">
+        <v-btn-group>
+          <v-btn
+            :color="activeTab === 'quantity' ? 'primary' : 'grey'"
+            variant="text"
+            @click="activeTab = 'quantity'"
+          >
+            {{ $t('dashboard.topCommodities.byQuantity') }}
+          </v-btn>
+          <v-btn
+            :color="activeTab === 'price' ? 'primary' : 'grey'"
+            variant="text"
+            @click="activeTab = 'price'"
+          >
+            {{ $t('dashboard.topCommodities.byPrice') }}
+          </v-btn>
+        </v-btn-group>
+      </div>
+
+      <div class="chart-container">
+        <apexchart
+          v-if="showBarChart"
+          ref="barChart"
+          type="bar"
+          height="300"
+          :options="barOptions"
+          :series="[{ name: activeTab === 'quantity' ? $t('dashboard.topCommodities.salesCount') : $t('dashboard.topCommodities.salesPrice'), data: series }]"
+        ></apexchart>
+        <apexchart
+          v-else
+          ref="pieChart"
+          type="pie"
+          height="300"
+          :options="pieOptions"
+          :series="series"
+        ></apexchart>
+      </div>
+
+      <div class="d-flex justify-end mt-4">
         <v-switch
           v-model="showBarChart"
           :label="$t('dashboard.topCommodities.chartToggle')"
@@ -10,91 +73,127 @@
           density="compact"
           hide-details
         ></v-switch>
-      </v-col>
-    </v-row>
-
-    <!-- نمایش نمودار انتخاب‌شده -->
-    <v-row dense>
-      <v-col cols="12" sm="12" md="12" v-if="showBarChart">
-        <apexchart ref="barChart" type="bar" height="200rem" :options="barOptions" :series="[{ name: $t('dashboard.topCommodities.salesCount'), data: series }]" ></apexchart>
-      </v-col>
-      <v-col cols="12" sm="12" md="12" v-else>
-        <apexchart ref="pieChart" type="pie" height="200rem" :options="pieOptions" :series="series"></apexchart>
-      </v-col>
-    </v-row>
-  </v-container>
+      </div>
+    </v-card-text>
+  </v-card>
 </template>
 
 <script>
 import VueApexCharts from 'vue3-apexcharts';
+import axios from 'axios';
 
 export default {
   name: 'TopCommoditiesChart',
   components: {
     apexchart: VueApexCharts,
   },
-  props: {
-    commodities: {
-      type: Array,
-      default: () => [],
-    },
-  },
   data() {
     const self = this;
     return {
-      showBarChart: true, // پیش‌فرض: نمودار میله‌ای
+      activeTab: 'quantity',
+      showBarChart: true,
+      period: 'year',
+      limit: 5,
       series: [],
+      commodities: [],
+      periodOptions: [
+        { title: this.$t('dashboard.period.today'), value: 'today' },
+        { title: this.$t('dashboard.period.week'), value: 'week' },
+        { title: this.$t('dashboard.period.month'), value: 'month' },
+        { title: this.$t('dashboard.period.year'), value: 'year' },
+      ],
+      limitOptions: [
+        { title: '۳', value: 3 },
+        { title: '۵', value: 5 },
+        { title: '۷', value: 7 },
+        { title: '۱۰', value: 10 },
+      ],
       pieOptions: {
         chart: {
           id: 'top-commodities-pie',
           fontFamily: "'Vazirmatn FD', Arial, sans-serif",
+          toolbar: { show: false }
         },
         labels: [],
-        colors: ['#FF6384', '#36A2EB', '#FFCE56', '#4BC0C0', '#9966FF', '#FF9F40', '#C9CBCF', '#7BC225', '#FF5733', '#C70039'],
+        colors: ['#2196F3', '#4CAF50', '#FFC107', '#F44336', '#9C27B0', '#00BCD4', '#FF9800', '#795548', '#607D8B', '#E91E63'],
         legend: {
-          position: 'top',
+          position: 'bottom',
+          fontSize: '14px',
+          fontFamily: "'Vazirmatn FD', Arial, sans-serif",
+          markers: {
+            width: 12,
+            height: 12,
+            radius: 6
+          }
         },
         tooltip: {
           y: {
             formatter: function(value, { dataPointIndex }) {
-              const unit = self.commodities[dataPointIndex]?.unit || '';
-              return `${value} ${unit}`;
+              const isPrice = self.activeTab === 'price';
+              if (isPrice) {
+                return `${self.$filters.formatNumber(value)} ${self.$t('currency.irr.short')}`;
+              }
+              return `${self.$filters.formatNumber(value)} ${self.commodities[dataPointIndex]?.unit || ''}`;
             },
           },
         },
         responsive: [{
           breakpoint: 480,
           options: {
-            chart: {
-              width: 200,
-            },
-            legend: {
-              position: 'bottom',
-            },
-          },
-        }],
+            chart: { width: '100%' },
+            legend: { position: 'bottom' }
+          }
+        }]
       },
       barOptions: {
         chart: {
           id: 'top-commodities-bar',
           fontFamily: "'Vazirmatn FD', Arial, sans-serif",
+          toolbar: { show: false }
         },
         xaxis: {
           categories: [],
+          labels: {
+            style: {
+              fontSize: '12px',
+              fontFamily: "'Vazirmatn FD', Arial, sans-serif"
+            }
+          }
         },
-        colors: ['#36A2EB'],
+        yaxis: {
+          labels: {
+            formatter: function(value) {
+              const isPrice = self.activeTab === 'price';
+              if (isPrice) {
+                return `${self.$filters.formatNumber(value)} ${self.$t('currency.irr.short')}`;
+              }
+              return self.$filters.formatNumber(value);
+            }
+          }
+        },
+        colors: ['#2196F3'],
         dataLabels: {
           enabled: true,
           formatter: function(value, { dataPointIndex }) {
-            const unit = self.commodities[dataPointIndex]?.unit || '';
-            return `${value} ${unit}`;
+            const isPrice = self.activeTab === 'price';
+            if (isPrice) {
+              return `${self.$filters.formatNumber(value)} ${self.$t('currency.irr.short')}`;
+            }
+            return `${self.$filters.formatNumber(value)} ${self.commodities[dataPointIndex]?.unit || ''}`;
           },
+          style: {
+            fontSize: '12px',
+            fontFamily: "'Vazirmatn FD', Arial, sans-serif"
+          }
         },
         tooltip: {
           y: {
             formatter: function(value, { dataPointIndex }) {
-              const unit = self.commodities[dataPointIndex]?.unit || '';
-              return `${value} ${unit}`;
+              const isPrice = self.activeTab === 'price';
+              if (isPrice) {
+                return `${self.$filters.formatNumber(value)} ${self.$t('currency.irr.short')}`;
+              }
+              return `${self.$filters.formatNumber(value)} ${self.commodities[dataPointIndex]?.unit || ''}`;
             },
           },
         },
@@ -102,39 +201,61 @@ export default {
           bar: {
             horizontal: false,
             columnWidth: '55%',
+            borderRadius: 4
           },
         },
+        grid: {
+          borderColor: '#f1f1f1',
+          strokeDashArray: 4
+        },
         responsive: [{
           breakpoint: 480,
           options: {
-            chart: {
-              width: 200,
-            },
-          },
-        }],
-      },
+            chart: { width: '100%' }
+          }
+        }]
+      }
     };
   },
   watch: {
-    commodities: {
-      immediate: true,
-      handler(newVal) {
-        this.updateCharts(newVal);
-      },
-    },
+    activeTab() {
+      this.fetchData();
+    }
   },
   methods: {
+    async fetchData() {
+      try {
+        const [quantityResponse, priceResponse] = await Promise.all([
+          axios.post('/api/report/top-selling-commodities', {
+            period: this.period,
+            limit: this.limit
+          }),
+          axios.post('/api/report/top-selling-commodities-by-price', {
+            period: this.period,
+            limit: this.limit
+          })
+        ]);
+        
+        this.updateCharts(
+          this.activeTab === 'quantity' ? quantityResponse.data : priceResponse.data
+        );
+      } catch (error) {
+        console.error('Fetch data error:', error);
+        this.updateCharts([]);
+      }
+    },
     updateCharts(commodities) {
       if (!commodities || !Array.isArray(commodities) || commodities.length === 0) {
         this.pieOptions.labels = [];
         this.barOptions.xaxis.categories = [];
         this.series = [];
+        this.commodities = [];
         return;
       }
 
-      // فیلتر کردن داده‌های معتبر
       const validCommodities = commodities.filter(item => {
-        const isValid = item && typeof item.name === 'string' && typeof item.count === 'number';
+        const isValid = item && typeof item.name === 'string' && 
+          (typeof item.count === 'number' || typeof item.totalPrice === 'number');
         if (!isValid) {
           console.warn('Invalid commodity item:', item);
         }
@@ -145,41 +266,80 @@ export default {
         this.pieOptions.labels = [];
         this.barOptions.xaxis.categories = [];
         this.series = [];
+        this.commodities = [];
         return;
       }
 
-      // به‌روزرسانی داده‌ها
+      this.commodities = validCommodities;
       this.pieOptions.labels = validCommodities.map(item => item.name);
       this.barOptions.xaxis.categories = validCommodities.map(item => item.name);
-      this.series = validCommodities.map(item => item.count);
+      this.series = validCommodities.map(item => 
+        this.activeTab === 'price' ? item.totalPrice : item.count
+      );
 
-      // رفرش کردن نمودار فعلی
       if (this.showBarChart && this.$refs.barChart) {
         this.$refs.barChart.refresh();
       } else if (!this.showBarChart && this.$refs.pieChart) {
         this.$refs.pieChart.refresh();
       }
-    },
+    }
   },
+  mounted() {
+    this.fetchData();
+  }
 };
 </script>
 
 <style scoped>
-.v-container {
-  padding: 0 !important;
+.top-commodities-chart {
+  height: 100%;
 }
 
-@media (max-width: 959px) {
-  .v-col {
-    flex: 0 0 100%;
-    max-width: 100%;
+.chart-container {
+  min-height: 300px;
+  width: 100%;
+}
+
+.period-select,
+.limit-select {
+  width: 120px;
+}
+
+.gap-2 {
+  gap: 8px;
+}
+
+:deep(.v-card-title) {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+  padding: 12px 16px;
+}
+
+:deep(.v-card-text) {
+  padding: 12px 16px;
+}
+
+:deep(.v-btn-group) {
+  border-radius: 8px;
+  overflow: hidden;
+}
+
+:deep(.v-btn) {
+  min-width: 100px;
+}
+
+@media (max-width: 600px) {
+  .chart-container {
+    min-height: 250px;
   }
-}
-
-@media (min-width: 960px) {
-  .v-col {
-    flex: 0 0 50%;
-    max-width: 50%;
+  
+  .period-select,
+  .limit-select {
+    width: 100px;
+  }
+  
+  :deep(.v-btn) {
+    min-width: 80px;
+    font-size: 0.875rem;
   }
 }
 </style>
\ No newline at end of file
diff --git a/webUI/src/components/widgets/TopCostCentersChart.vue b/webUI/src/components/widgets/TopCostCentersChart.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/components/widgets/TopIncomeCentersChart.vue b/webUI/src/components/widgets/TopIncomeCentersChart.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/css/main.css b/webUI/src/css/main.css
old mode 100755
new mode 100644
diff --git a/webUI/src/hesabixConfig.js b/webUI/src/hesabixConfig.js
old mode 100755
new mode 100644
diff --git a/webUI/src/i18n/calendarLocalConfig.ts b/webUI/src/i18n/calendarLocalConfig.ts
old mode 100755
new mode 100644
diff --git a/webUI/src/i18n/en_lang.ts b/webUI/src/i18n/en_lang.ts
old mode 100755
new mode 100644
diff --git a/webUI/src/i18n/fa_lang.ts b/webUI/src/i18n/fa_lang.ts
old mode 100755
new mode 100644
index 7f2dbed..892ac8d
--- a/webUI/src/i18n/fa_lang.ts
+++ b/webUI/src/i18n/fa_lang.ts
@@ -81,7 +81,10 @@ const fa_lang = {
       "limit": "تعداد کالاها",
       "noData": "داده‌ای برای نمایش وجود ندارد",
       "salesCount": "تعداد فروش",
-      chartToggle: "تغییر نوع نمودار",
+      "salesPrice": "قیمت فروش",
+      "byQuantity": "بر اساس تعداد",
+      "byPrice": "بر اساس قیمت",
+      "chartToggle": "تغییر نوع نمودار",
     },
     "period": {
       "today": "امروز",
@@ -148,6 +151,7 @@ const fa_lang = {
     storeroom_ticket: "حواله انبار",
     storerooms: "انبار‌ها",
     commodity_exist_count: "موجودی کالا",
+    inventory: "موجودی کالا",
     buy_cost: "خرید و هزینه",
     sell_income: "فروش و درآمد",
     buy_invoices: " خرید",
@@ -410,6 +414,22 @@ const fa_lang = {
     next_page: "صفحه بعد",
     business_stamp: "مهر کسب و کار",
     invoice_index: "نمایه فاکتور",
+    inventory: {
+      title: "موجودی کالا",
+      add_item: "افزودن کالا",
+      select_commodity: "انتخاب کالا",
+      quantity: "تعداد",
+      unit_price: "قیمت واحد",
+      total_price: "قیمت کل",
+      actions: "عملیات",
+      duplicate_item: "این کالا قبلاً در لیست انتخاب شده است",
+      save_success: "موجودی کالا با موفقیت ذخیره شد",
+      save_error: "خطا در ذخیره موجودی کالا",
+      delete_confirm: "آیا از حذف این کالا اطمینان دارید؟",
+      delete_success: "کالا با موفقیت حذف شد",
+      delete_error: "خطا در حذف کالا",
+      load_error: "خطا در بارگذاری داده‌ها"
+    },
     change_password: {
       title: "تغییر کلمه عبور",
       new_password: "کلمه عبور جدید",
diff --git a/webUI/src/i18n/i18n.ts b/webUI/src/i18n/i18n.ts
old mode 100755
new mode 100644
diff --git a/webUI/src/main.ts b/webUI/src/main.ts
old mode 100755
new mode 100644
diff --git a/webUI/src/registerServiceWorker.js b/webUI/src/registerServiceWorker.js
old mode 100755
new mode 100644
diff --git a/webUI/src/router/index.ts b/webUI/src/router/index.ts
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/_override.scss b/webUI/src/scss/_override.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/_variables.scss b/webUI/src/scss/_variables.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/components/_VAlert.scss b/webUI/src/scss/components/_VAlert.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/components/_VBadge.scss b/webUI/src/scss/components/_VBadge.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/components/_VBreadcrumb.scss b/webUI/src/scss/components/_VBreadcrumb.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/components/_VButtons.scss b/webUI/src/scss/components/_VButtons.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/components/_VCard.scss b/webUI/src/scss/components/_VCard.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/components/_VField.scss b/webUI/src/scss/components/_VField.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/components/_VInput.scss b/webUI/src/scss/components/_VInput.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/components/_VList.scss b/webUI/src/scss/components/_VList.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/components/_VNavigationDrawer.scss b/webUI/src/scss/components/_VNavigationDrawer.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/components/_VShadow.scss b/webUI/src/scss/components/_VShadow.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/components/_VTextField.scss b/webUI/src/scss/components/_VTextField.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/components/_VTextarea.scss b/webUI/src/scss/components/_VTextarea.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/layout/_container.scss b/webUI/src/scss/layout/_container.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/layout/_footer.scss b/webUI/src/scss/layout/_footer.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/layout/_horizontal.scss b/webUI/src/scss/layout/_horizontal.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/layout/_sidebar.scss b/webUI/src/scss/layout/_sidebar.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/layout/_topbar.scss b/webUI/src/scss/layout/_topbar.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/scss/style.scss b/webUI/src/scss/style.scss
old mode 100755
new mode 100644
diff --git a/webUI/src/stores/applicationStore.ts b/webUI/src/stores/applicationStore.ts
old mode 100755
new mode 100644
diff --git a/webUI/src/stores/counter.ts b/webUI/src/stores/counter.ts
old mode 100755
new mode 100644
diff --git a/webUI/src/stores/userStore.ts b/webUI/src/stores/userStore.ts
old mode 100755
new mode 100644
diff --git a/webUI/src/theme/DarkTheme.ts b/webUI/src/theme/DarkTheme.ts
old mode 100755
new mode 100644
diff --git a/webUI/src/theme/LightTheme.ts b/webUI/src/theme/LightTheme.ts
old mode 100755
new mode 100644
diff --git a/webUI/src/views/NotFound.vue b/webUI/src/views/NotFound.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/App.vue b/webUI/src/views/acc/App.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/accounting/closeyear.vue b/webUI/src/views/acc/accounting/closeyear.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/accounting/list.vue b/webUI/src/views/acc/accounting/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/accounting/mod.vue b/webUI/src/views/acc/accounting/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/accounting/openBalance.vue b/webUI/src/views/acc/accounting/openBalance.vue
old mode 100755
new mode 100644
index 51d4681..386b116
--- a/webUI/src/views/acc/accounting/openBalance.vue
+++ b/webUI/src/views/acc/accounting/openBalance.vue
@@ -35,6 +35,11 @@
                   {{ $filters.formatNumber(sums.salarys, true) }}
                 </template>
               </v-list-item>
+              <v-list-item @click="sheet.inventory = !sheet.inventory" value="inventory" :title="$t('drawer.inventory')">
+                <template v-slot:append>
+                  {{ $filters.formatNumber(sums.inventory, true) }}
+                </template>
+              </v-list-item>
               <v-list-item :title="$t('dialog.sum')" class="bg-light">
                 <template v-slot:append>
                   {{ $filters.formatNumber(sums.degSum, true) }}
@@ -85,7 +90,7 @@
     <v-card>
       <v-card-text>
         <v-row>
-          <v-col v-for="item in data.banks" key="item.info.id">
+          <v-col v-for="item in data.banks" :key="item.info.id" cols="12" sm="6" md="4">
             <div class="form-floating mb-3">
               <money3 v-bind="currencyConfig" min=0 class="form-control" v-model="item.openbalance" />
               <label for="floatingInput">{{ item.info.name }} ({{ $filters.getActiveMoney().symbol }}) </label>
@@ -114,7 +119,7 @@
     <v-card>
       <v-card-text>
         <v-row>
-          <v-col v-for="item in data.cashdesks" key="item.info.id">
+          <v-col v-for="item in data.cashdesks" :key="item.info.id" cols="12" sm="6" md="4">
             <div class="form-floating mb-3">
               <money3 v-bind="currencyConfig" min=0 class="form-control" v-model="item.openbalance" />
               <label for="floatingInput">{{ item.info.name }} ({{ $filters.getActiveMoney().symbol }}) </label>
@@ -143,7 +148,7 @@
     <v-card>
       <v-card-text>
         <v-row>
-          <v-col v-for="item in data.salarys" key="item.info.id">
+          <v-col v-for="item in data.salarys" :key="item.info.id" cols="12" sm="6" md="4">
             <div class="form-floating mb-3">
               <money3 v-bind="currencyConfig" min=0 class="form-control" v-model="item.openbalance" />
               <label for="floatingInput">{{ item.info.name }} ({{ $filters.getActiveMoney().symbol }}) </label>
@@ -172,7 +177,7 @@
     <v-card>
       <v-card-text>
         <v-row>
-          <v-col v-for="item in data.shareholders" key="item.info.id">
+          <v-col v-for="item in data.shareholders" :key="item.info.id" cols="12" sm="6" md="4">
             <div class="form-floating mb-3">
               <money3 v-bind="currencyConfig" min=0 class="form-control" v-model="item.openbalance" />
               <label for="floatingInput">{{ item.info.nikename }} ({{ $filters.getActiveMoney().symbol }}) </label>
@@ -182,20 +187,210 @@
       </v-card-text>
     </v-card>
   </v-bottom-sheet>
+  <v-dialog v-model="sheet.inventory" fullscreen>
+    <v-card class="d-flex flex-column" style="height: 100vh;">
+      <v-toolbar color="toolbar" :title="$t('drawer.inventory')" class="flex-grow-0">
+        <template v-slot:prepend>
+          <v-tooltip :text="$t('dialog.close')" location="bottom">
+            <template v-slot:activator="{ props }">
+              <v-btn v-bind="props" @click="sheet.inventory = false" class="d-none d-sm-flex" variant="text"
+                icon="mdi-close" />
+            </template>
+          </v-tooltip>
+        </template>
+        <v-spacer></v-spacer>
+        <v-tooltip :text="$t('dialog.save')" location="bottom">
+          <template v-slot:activator="{ props }">
+            <v-btn
+              v-bind="props"
+              :loading="loading"
+              @click="saveInventory()"
+              color="success"
+              variant="text"
+              icon="mdi-content-save"
+            />
+          </template>
+        </v-tooltip>
+      </v-toolbar>
+      <v-table class="border d-none d-sm-table" style="width: 100%;">
+          <thead>
+            <tr style="background-color: #0D47A1; color: white;">
+              <th class="text-center">ردیف</th>
+              <th class="text-center">نام کالا</th>
+              <th class="text-center">تعداد</th>
+              <th class="text-center">قیمت واحد</th>
+              <th class="text-center">قیمت کل</th>
+              <th class="text-center">عملیات</th>
+            </tr>
+          </thead>
+          <tbody>
+            <template v-for="(item, index) in data.commodities" :key="index">
+              <tr :style="{ backgroundColor: index % 2 === 0 ? '#f8f9fa' : 'white', height: '64px' }">
+                <td class="text-center">{{ index + 1 }}</td>
+                <td class="text-center" style="min-width: 200px;">
+                  <Hcommoditysearch
+                    v-model="item.info"
+                    density="compact"
+                    hide-details
+                    class="my-0"
+                    style="font-size: 0.8rem;"
+                    return-object
+                    @update:model-value="updateCommodityInfo(item)"
+                  />
+                </td>
+                <td class="text-center" style="width: 100px;">
+                  <Hnumberinput
+                    v-model="item.count"
+                    density="compact"
+                    hide-details
+                    class="my-0"
+                    style="font-size: 0.8rem;"
+                    @update:model-value="calculateTotalPrice(item)"
+                  />
+                </td>
+                <td class="text-center" style="width: 120px;">
+                  <Hnumberinput
+                    v-model="item.price"
+                    density="compact"
+                    hide-details
+                    class="my-0"
+                    style="font-size: 0.8rem;"
+                    @update:model-value="calculateTotalPrice(item)"
+                  />
+                </td>
+                <td class="text-center font-weight-bold" style="width: 120px;">
+                  {{ item.totalPrice.toLocaleString('fa-IR') }}
+                </td>
+                <td class="text-center">
+                  <v-tooltip text="حذف" location="bottom">
+                    <template v-slot:activator="{ props }">
+                      <v-btn
+                        v-bind="props"
+                        icon="mdi-delete"
+                        variant="text"
+                        size="small"
+                        color="error"
+                        @click="removeInventoryItem(item)"
+                      ></v-btn>
+                    </template>
+                  </v-tooltip>
+                </td>
+              </tr>
+            </template>
+            <tr>
+              <td colspan="6" class="text-center pa-2" style="height: 64px;">
+                <v-btn color="primary" prepend-icon="mdi-plus" size="small" @click="addInventoryItem">
+                  {{ $t('dialog.inventory.add_item') }}
+                </v-btn>
+              </td>
+            </tr>
+          </tbody>
+        </v-table>
+      <v-card-text>
+        <!-- جدول موبایل -->
+        <div class="d-sm-none">
+          <v-card v-for="(item, index) in data.commodities" :key="index" class="mb-4" variant="outlined">
+            <v-card-text>
+              <div class="d-flex justify-space-between align-center mb-2">
+                <span class="text-subtitle-2 font-weight-bold">ردیف:</span>
+                <span>{{ index + 1 }}</span>
+              </div>
+              <div class="mb-2">
+                <Hcommoditysearch
+                  v-model="item.info"
+                  density="compact"
+                  label="نام کالا"
+                  hide-details
+                  class="my-0"
+                  style="font-size: 0.8rem;"
+                  return-object
+                  @update:model-value="updateCommodityInfo(item)"
+                />
+              </div>
+              <div class="d-flex justify-space-between mb-2">
+                <div style="width: 48%;">
+                  <Hnumberinput
+                    v-model="item.count"
+                    density="compact"
+                    label="تعداد"
+                    hide-details
+                    class="my-0"
+                    style="font-size: 0.8rem;"
+                    @update:model-value="calculateTotalPrice(item)"
+                  />
+                </div>
+                <div style="width: 48%;">
+                  <Hnumberinput
+                    v-model="item.price"
+                    density="compact"
+                    label="قیمت واحد"
+                    hide-details
+                    class="my-0"
+                    style="font-size: 0.8rem;"
+                    @update:model-value="calculateTotalPrice(item)"
+                  />
+                </div>
+              </div>
+              <div class="d-flex justify-space-between align-center">
+                <span class="text-subtitle-2 font-weight-bold">قیمت کل:</span>
+                <span class="text-subtitle-2 font-weight-bold">{{ item.totalPrice.toLocaleString('fa-IR') }}</span>
+              </div>
+            </v-card-text>
+            <v-card-actions>
+              <v-spacer></v-spacer>
+              <v-btn icon="mdi-delete" variant="text" color="error" @click="removeInventoryItem(item)"></v-btn>
+            </v-card-actions>
+          </v-card>
+          <v-btn color="primary" prepend-icon="mdi-plus" block class="mb-4" @click="addInventoryItem">
+            {{ $t('dialog.inventory.add_item') }}
+          </v-btn>
+        </div>
+      </v-card-text>
+    </v-card>
+  </v-dialog>
+
+  <v-snackbar
+    v-model="snackbar.show"
+    :color="snackbar.color"
+    :timeout="3000"
+  >
+    {{ snackbar.text }}
+    <template v-slot:actions>
+      <v-btn
+        color="white"
+        variant="text"
+        @click="snackbar.show = false"
+      >
+        بستن
+      </v-btn>
+    </template>
+  </v-snackbar>
 </template>
 
 <script>
 import axios from "axios";
 import Loading from 'vue-loading-overlay';
+import Hcommoditysearch from '@/components/forms/Hcommoditysearch.vue';
+import Hnumberinput from '@/components/forms/Hnumberinput.vue';
 
 export default {
   name: "table",
   components: {
-    Loading
+    Loading,
+    Hcommoditysearch,
+    Hnumberinput
   },
   data: () => {
     return {
       loading: false,
+      inventoryHeaders: [
+        { title: 'ردیف', key: 'row', sortable: false },
+        { title: 'کالا', key: 'name', sortable: false },
+        { title: 'تعداد', key: 'count', sortable: false },
+        { title: 'قیمت واحد', key: 'price', sortable: false },
+        { title: 'قیمت کل', key: 'totalPrice', sortable: false },
+        { title: 'عملیات', key: 'actions', sortable: false },
+      ],
       currencyConfig: {
         masked: false,
         prefix: '',
@@ -217,20 +412,28 @@ export default {
         cashdesks: false,
         salarys: false,
         shareholders: false,
+        inventory: false,
       },
       data: {
         banks: [],
         cashdesks: [],
         salarys: [],
         shareholders: [],
+        commodities: [],
       },
       sums: {
         banks: 0,
         cashdesks: 0,
         salarys: 0,
         shareholders: 0,
+        inventory: 0,
         degSum: 0,
         shareSum: 0,
+      },
+      snackbar: {
+        show: false,
+        text: '',
+        color: 'error'
       }
     }
   },
@@ -243,46 +446,34 @@ export default {
       this.sums.cashdesks = 0;
       this.sums.salarys = 0;
       this.sums.shareholders = 0;
+      this.sums.inventory = 0;
 
       axios.post('/api/openbalance/get').then((Response) => {
+        if (Response.data && Response.data.data) {
         this.data = Response.data.data;
-        this.data.banks.forEach((item) => {
-          if (item.openbalance != undefined) {
-            this.sums.banks += parseFloat(item.openbalance);
+          // اطمینان از وجود آرایه commodities
+          if (!this.data.commodities) {
+            this.data.commodities = [];
           }
-          else {
-            item.openbalance = 0;
+          
+          // محاسبه مجموع موجودی کالا
+          if (this.data.commodities) {
+            this.data.commodities.forEach(item => {
+              if (item.totalPrice) {
+                this.sums.inventory += parseFloat(item.totalPrice);
+              }
+            });
           }
-        });
-        this.data.cashdesks.forEach((item) => {
-          if (item.openbalance != undefined) {
-            this.sums.cashdesks += parseFloat(item.openbalance);
-          }
-          else {
-            item.openbalance = 0;
-          }
-        });
-        this.data.salarys.forEach((item) => {
-          if (item.openbalance != undefined) {
-            this.sums.salarys += parseFloat(item.openbalance);
-          }
-          else {
-            item.openbalance = 0;
-          }
-        });
-        this.data.shareholders.forEach((item) => {
-          if (item.openbalance != undefined) {
-            this.sums.shareholders += parseFloat(item.openbalance);
-          }
-          else {
-            item.openbalance = 0;
-          }
-        });
-        this.sums.degSum = parseFloat(this.sums.banks) + parseFloat(this.sums.cashdesks) + parseFloat(this.sums.salarys);
-        this.sums.shareSum = parseFloat(this.sums.shareholders);
-
+          
+          this.sums.degSum = parseFloat(this.sums.banks) + parseFloat(this.sums.cashdesks) + parseFloat(this.sums.salarys) + parseFloat(this.sums.inventory);
+          this.sums.shareSum = parseFloat(this.sums.shareholders);
+        }
+      }).catch(error => {
+        console.error('Error loading data:', error);
+        this.snackbar.text = 'خطا در بارگذاری داده‌ها';
+        this.snackbar.color = 'error';
+        this.snackbar.show = true;
       });
-
     },
     saveBanks() {
       this.loading = true;
@@ -316,8 +507,134 @@ export default {
         this.sheet.shareholders = false;
       })
     },
-  }
+    calculateTotalPrice(item) {
+      item.totalPrice = parseFloat(item.count || 0) * parseFloat(item.price || 0);
+    },
+    addInventoryItem() {
+      if (!this.data.commodities) {
+        this.data.commodities = [];
+      }
+      this.data.commodities.push({
+        info: null,
+        count: 0,
+        price: 0,
+        totalPrice: 0
+      });
+    },
+    updateCommodityInfo(item) {
+      if (item.info) {
+        // بررسی تکراری بودن کالا
+        const duplicateItem = this.data.commodities.find(commodity => 
+          commodity !== item && // بررسی نکنیم که خود آیتم فعلی باشد
+          commodity.info && // مطمئن شویم که info خالی نیست
+          commodity.info.id === item.info.id // مقایسه id کالاها
+        );
 
+        if (duplicateItem) {
+          // نمایش پیام خطا
+          this.snackbar.text = 'این کالا قبلاً در لیست انتخاب شده است';
+          this.snackbar.color = 'error';
+          this.snackbar.show = true;
+          
+          // پاک کردن انتخاب
+          item.info = null;
+          item.price = 0;
+          item.count = 0;
+          this.calculateTotalPrice(item);
+          return;
+        }
+
+        // اگر تکراری نبود، قیمت را به‌روز کن
+        item.price = item.info.basePrice || 0;
+        this.calculateTotalPrice(item);
+      }
+    },
+    removeInventoryItem(item) {
+      const index = this.data.commodities.indexOf(item);
+      if (index > -1) {
+        this.data.commodities.splice(index, 1);
+      }
+    },
+    saveInventory() {
+      if (!this.validateInventory()) {
+        return;
+      }
+      this.loading = true;
+      // محاسبه مجدد قیمت کل برای همه اقلام
+      this.data.commodities.forEach(item => {
+        this.calculateTotalPrice(item);
+      });
+
+      // تبدیل داده‌ها به فرمت مورد نیاز بک‌اند
+      const commoditiesData = this.data.commodities.map(item => ({
+        info: {
+          id: item.info.id,
+          code: item.info.code,
+          name: item.info.name
+        },
+        count: parseFloat(item.count),
+        price: parseFloat(item.price),
+        totalPrice: parseFloat(item.totalPrice)
+      }));
+
+      axios.post('/api/openbalance/save/commodities', commoditiesData).then((Response) => {
+        this.loading = false;
+        this.loadData();
+        this.sheet.inventory = false;
+        this.snackbar.text = this.$t('dialog.inventory.save_success');
+        this.snackbar.color = 'success';
+        this.snackbar.show = true;
+      }).catch(error => {
+        this.loading = false;
+        this.snackbar.text = this.$t('dialog.inventory.save_error');
+        this.snackbar.color = 'error';
+        this.snackbar.show = true;
+        console.error('Error saving inventory:', error);
+      });
+    },
+    validateInventory() {
+      // بررسی تکمیل اطلاعات هر کالا
+      for (const item of this.data.commodities) {
+        // بررسی انتخاب کالا
+        if (!item.info) {
+          this.snackbar.text = 'لطفاً کالا را برای تمام سطرها انتخاب کنید';
+          this.snackbar.color = 'error';
+          this.snackbar.show = true;
+          return false;
+        }
+
+        // بررسی تعداد
+        if (!item.count || parseFloat(item.count) <= 0) {
+          this.snackbar.text = 'تعداد کالا باید بزرگتر از صفر باشد';
+          this.snackbar.color = 'error';
+          this.snackbar.show = true;
+          return false;
+        }
+
+        // بررسی قیمت
+        if (!item.price || parseFloat(item.price) <= 0) {
+          this.snackbar.text = 'قیمت کالا باید بزرگتر از صفر باشد';
+          this.snackbar.color = 'error';
+          this.snackbar.show = true;
+          return false;
+        }
+      }
+
+      // بررسی تکراری نبودن کالاها
+      const commodityIds = new Set();
+      for (const item of this.data.commodities) {
+        if (commodityIds.has(item.info.id)) {
+          this.snackbar.text = 'کالای تکراری در لیست وجود دارد';
+          this.snackbar.color = 'error';
+          this.snackbar.show = true;
+          return false;
+        }
+        commodityIds.add(item.info.id);
+      }
+
+      return true;
+    },
+  }
 }
 </script>
 
diff --git a/webUI/src/views/acc/accounting/table.vue b/webUI/src/views/acc/accounting/table.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/accounting/viewDoc.vue b/webUI/src/views/acc/accounting/viewDoc.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/api/list.vue b/webUI/src/views/acc/api/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/archive/order_new.vue b/webUI/src/views/acc/archive/order_new.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/archive/orders_list.vue b/webUI/src/views/acc/archive/orders_list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/archive/view_files.vue b/webUI/src/views/acc/archive/view_files.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/bank/card.vue b/webUI/src/views/acc/bank/card.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/bank/list.vue b/webUI/src/views/acc/bank/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/bank/mod.vue b/webUI/src/views/acc/bank/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/buy/list.vue b/webUI/src/views/acc/buy/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/buy/mod.vue b/webUI/src/views/acc/buy/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/buy/viewInvoice.vue b/webUI/src/views/acc/buy/viewInvoice.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/cashdesk/card.vue b/webUI/src/views/acc/cashdesk/card.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/cashdesk/list.vue b/webUI/src/views/acc/cashdesk/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/cashdesk/mod.vue b/webUI/src/views/acc/cashdesk/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/cheque/input.vue b/webUI/src/views/acc/cheque/input.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/cheque/list.vue b/webUI/src/views/acc/cheque/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/cheque/mod.vue b/webUI/src/views/acc/cheque/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/cheque/output.vue b/webUI/src/views/acc/cheque/output.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/cheque/transfer.vue b/webUI/src/views/acc/cheque/transfer.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/commodity/cat/list.vue b/webUI/src/views/acc/commodity/cat/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/commodity/drop/list.vue b/webUI/src/views/acc/commodity/drop/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/commodity/drop/mod.vue b/webUI/src/views/acc/commodity/drop/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/commodity/list.vue b/webUI/src/views/acc/commodity/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/commodity/mod.vue b/webUI/src/views/acc/commodity/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/commodity/priceList/list.vue b/webUI/src/views/acc/commodity/priceList/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/commodity/priceList/mod.vue b/webUI/src/views/acc/commodity/priceList/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/commodity/priceList/pricelistedit.vue b/webUI/src/views/acc/commodity/priceList/pricelistedit.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/commodity/priceList/view.vue b/webUI/src/views/acc/commodity/priceList/view.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/Currency.vue b/webUI/src/views/acc/component/Currency.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/Year.vue b/webUI/src/views/acc/component/Year.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/archive/archiveUpload.vue b/webUI/src/views/acc/component/archive/archiveUpload.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/archive/archive_modal.vue b/webUI/src/views/acc/component/archive/archive_modal.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/commodity/changePriceGroup.vue b/webUI/src/views/acc/component/commodity/changePriceGroup.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/commodity/quickAddCommodity.vue b/webUI/src/views/acc/component/commodity/quickAddCommodity.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/documentLogButton.vue b/webUI/src/views/acc/component/documentLogButton.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/helpBtn.vue b/webUI/src/views/acc/component/helpBtn.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/hitable.vue b/webUI/src/views/acc/component/hitable.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/importModal/commodity-import-excel.vue b/webUI/src/views/acc/component/importModal/commodity-import-excel.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/importModal/person-import-excel.vue b/webUI/src/views/acc/component/importModal/person-import-excel.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/mostdes.vue b/webUI/src/views/acc/component/mostdes.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/notes.vue b/webUI/src/views/acc/component/notes.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/notifications/icon.vue b/webUI/src/views/acc/component/notifications/icon.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/person.vue b/webUI/src/views/acc/component/person.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/person/quickAdd.vue b/webUI/src/views/acc/component/person/quickAdd.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/person/quickView.vue b/webUI/src/views/acc/component/person/quickView.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/rec.vue b/webUI/src/views/acc/component/rec.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/recList.vue b/webUI/src/views/acc/component/recList.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/reports/detailsBtn.vue b/webUI/src/views/acc/component/reports/detailsBtn.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/send.vue b/webUI/src/views/acc/component/send.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/smsPanel.vue b/webUI/src/views/acc/component/smsPanel.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/component/widgets/saleChart.vue b/webUI/src/views/acc/component/widgets/saleChart.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/costs/list.vue b/webUI/src/views/acc/costs/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/costs/mod.vue b/webUI/src/views/acc/costs/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/dashboard.vue b/webUI/src/views/acc/dashboard.vue
old mode 100755
new mode 100644
index 60575d7..804ad0c
--- a/webUI/src/views/acc/dashboard.vue
+++ b/webUI/src/views/acc/dashboard.vue
@@ -35,27 +35,7 @@
 
       <!-- کارت جدید: کالاهای پرفروش -->
       <v-col cols="12" sm="12" md="12" v-show="permissions.sell && dashboard.topCommodities">
-        <v-card class="animate__animated animate__zoomIn card-equal-height_big" variant="outlined"
-          prepend-icon="mdi-chart-pie" :title="$t('dashboard.topCommodities.title')" hover>
-          <v-card-text class="pa-2">
-            <!-- دکمه‌های انتخاب بازه زمانی و تعداد -->
-            <v-row>
-              <v-col cols="6">
-                <v-select v-model="topCommoditiesPeriod" :items="periodOptions"
-                  :label="$t('dashboard.topCommodities.period')" density="compact" outlined
-                  @update:modelValue="fetchTopCommodities"></v-select>
-              </v-col>
-              <v-col cols="6">
-                <v-select v-model="topCommoditiesLimit" :items="limitOptions"
-                  :label="$t('dashboard.topCommodities.limit')" density="compact" outlined
-                  @update:modelValue="fetchTopCommodities"></v-select>
-              </v-col>
-            </v-row>
-            <!-- نمودارها -->
-            <top-commodities-chart :commodities="topCommodities" v-if="topCommodities.length > 0" />
-            <p v-else class="text-center">{{ $t('dashboard.topCommodities.noData') }}</p>
-          </v-card-text>
-        </v-card>
+        <top-commodities-chart class="animate__animated animate__zoomIn" />
       </v-col>
 
       <v-col cols="12" sm="12" md="6" v-show="permissions.cost && dashboard.topCostCenters">
@@ -315,21 +295,6 @@ export default {
         incomes: false,
         topIncomeCenters: false,
       },
-      topCommodities: [],
-      topCommoditiesPeriod: 'year',
-      topCommoditiesLimit: 5,
-      periodOptions: [
-        { title: self.$t('dashboard.period.today'), value: 'today' },
-        { title: self.$t('dashboard.period.week'), value: 'week' },
-        { title: self.$t('dashboard.period.month'), value: 'month' },
-        { title: self.$t('dashboard.period.year'), value: 'year' },
-      ],
-      limitOptions: [
-        { title: '۳', value: 3 },
-        { title: '۵', value: 5 },
-        { title: '۷', value: 7 },
-        { title: '۱۰', value: 10 },
-      ],
     };
   },
   methods: {
@@ -359,7 +324,7 @@ export default {
         this.loading = false;
       }
     },
-    async fetchIncomeData() { // متد جدید برای گرفتن داده‌های درآمد
+    async fetchIncomeData() {
       this.loading = true;
       try {
         const response = await axios.get('/api/income/dashboard/data');
@@ -389,37 +354,18 @@ export default {
         this.statements = statements.data;
         this.stat = stats.data;
 
-        if (this.dashboard.topCommodities) {
-          await this.fetchTopCommodities();
-        }
         if (this.dashboard.costs && this.permissions.cost) {
           await this.fetchCostData();
         }
-        if (this.dashboard.incomes && this.permissions.income) { // بارگذاری داده‌های درآمد
+        if (this.dashboard.incomes && this.permissions.income) {
           await this.fetchIncomeData();
         }
-        // نیازی به بارگذاری داده‌های نمودار اینجا نیست، کامپوننت خودش داده را می‌گیرد
       } catch (error) {
         console.error('Load data error:', error);
       } finally {
         this.loading = false;
       }
     },
-    async fetchTopCommodities() {
-      this.loading = true;
-      try {
-        const response = await axios.post('/api/report/top-selling-commodities', {
-          period: this.topCommoditiesPeriod,
-          limit: this.topCommoditiesLimit,
-        });
-        this.topCommodities = response.data;
-      } catch (error) {
-        console.error('Fetch top commodities error:', error);
-        this.topCommodities = [];
-      } finally {
-        this.loading = false;
-      }
-    },
   },
   mounted() {
     this.loadData();
@@ -436,11 +382,4 @@ export default {
   flex-direction: column;
   justify-content: space-between;
 }
-
-.card-equal-height_big {
-  height: 550;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
 </style>
\ No newline at end of file
diff --git a/webUI/src/views/acc/incomes/list.vue b/webUI/src/views/acc/incomes/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/incomes/mod.vue b/webUI/src/views/acc/incomes/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/notifications/notifications.vue b/webUI/src/views/acc/notifications/notifications.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/persons/card.vue b/webUI/src/views/acc/persons/card.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/persons/insert.vue b/webUI/src/views/acc/persons/insert.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/persons/list.vue b/webUI/src/views/acc/persons/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/persons/receive/list.vue b/webUI/src/views/acc/persons/receive/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/persons/receive/mod.vue b/webUI/src/views/acc/persons/receive/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/persons/send/list.vue b/webUI/src/views/acc/persons/send/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/persons/send/mod.vue b/webUI/src/views/acc/persons/send/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/accpro/intro.vue b/webUI/src/views/acc/plugins/accpro/intro.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/amartemanma/intro.vue b/webUI/src/views/acc/plugins/amartemanma/intro.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/cc/intro.vue b/webUI/src/views/acc/plugins/cc/intro.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/noghre/employess/list.vue b/webUI/src/views/acc/plugins/noghre/employess/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/noghre/employess/mod.vue b/webUI/src/views/acc/plugins/noghre/employess/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/noghre/intro.vue b/webUI/src/views/acc/plugins/noghre/intro.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/noghre/order/list.vue b/webUI/src/views/acc/plugins/noghre/order/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/noghre/order/mod.vue b/webUI/src/views/acc/plugins/noghre/order/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/noghre/order/view.vue b/webUI/src/views/acc/plugins/noghre/order/view.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/noghre/pays.vue b/webUI/src/views/acc/plugins/noghre/pays.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/onlinestore/dashboard.vue b/webUI/src/views/acc/plugins/onlinestore/dashboard.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/onlinestore/intro.vue b/webUI/src/views/acc/plugins/onlinestore/intro.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/repservice/intro.vue b/webUI/src/views/acc/plugins/repservice/intro.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/repservice/list.vue b/webUI/src/views/acc/plugins/repservice/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/repservice/mod.vue b/webUI/src/views/acc/plugins/repservice/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/repservice/view.vue b/webUI/src/views/acc/plugins/repservice/view.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/plugins/resamap/intro.vue b/webUI/src/views/acc/plugins/resamap/intro.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/presell/list.vue b/webUI/src/views/acc/presell/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/presell/mod.vue b/webUI/src/views/acc/presell/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/presell/view.vue b/webUI/src/views/acc/presell/view.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/presell/viewInvoice.vue b/webUI/src/views/acc/presell/viewInvoice.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/printers/list.vue b/webUI/src/views/acc/printers/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/printers/printList.vue b/webUI/src/views/acc/printers/printList.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/printers/queue.vue b/webUI/src/views/acc/printers/queue.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/printers/templates.vue b/webUI/src/views/acc/printers/templates.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/reports/balanceSheet.vue b/webUI/src/views/acc/reports/balanceSheet.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/reports/commodity/buysellByCommodity.vue b/webUI/src/views/acc/reports/commodity/buysellByCommodity.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/reports/explore_accounts.vue b/webUI/src/views/acc/reports/explore_accounts.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/reports/persons/buysellByPerson.vue b/webUI/src/views/acc/reports/persons/buysellByPerson.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/reports/persons/debtors.vue b/webUI/src/views/acc/reports/persons/debtors.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/reports/persons/depositors.vue b/webUI/src/views/acc/reports/persons/depositors.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/reports/reports.vue b/webUI/src/views/acc/reports/reports.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/rfbuy/list.vue b/webUI/src/views/acc/rfbuy/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/rfbuy/mod.vue b/webUI/src/views/acc/rfbuy/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/rfbuy/viewInvoice.vue b/webUI/src/views/acc/rfbuy/viewInvoice.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/rfsell/list.vue b/webUI/src/views/acc/rfsell/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/rfsell/mod.vue b/webUI/src/views/acc/rfsell/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/rfsell/viewInvoice.vue b/webUI/src/views/acc/rfsell/viewInvoice.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/router/index.js b/webUI/src/views/acc/router/index.js
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/salary/card.vue b/webUI/src/views/acc/salary/card.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/salary/list.vue b/webUI/src/views/acc/salary/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/salary/mod.vue b/webUI/src/views/acc/salary/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/sell/fastMod.vue b/webUI/src/views/acc/sell/fastMod.vue
old mode 100755
new mode 100644
index 3d5ad23..75c0cc7
--- a/webUI/src/views/acc/sell/fastMod.vue
+++ b/webUI/src/views/acc/sell/fastMod.vue
@@ -267,11 +267,12 @@ export default defineComponent({
             if (response.data.result == '1') {
               this.update = response.data.doc.code;
               if (this.canPrint || this.canPrintCashdeskRecp) {
-                axios.post('/api/sell/posprinter/invoice', {
+                axios.post('/api/sell/print/invoice', {
                   code: this.update,
                   pdf: this.canPdf,
                   posPrint: this.canPrint,
-                  posPrintRecp: this.canPrintCashdeskRecp
+                  posPrintRecp: this.canPrintCashdeskRecp,
+                  printers: this.canPdf
                 }).then((response) => {
                   if (this.canPdf) {
                     this.printID = response.data.id;
diff --git a/webUI/src/views/acc/sell/list.vue b/webUI/src/views/acc/sell/list.vue
old mode 100755
new mode 100644
index 6d784ea..ad893f7
--- a/webUI/src/views/acc/sell/list.vue
+++ b/webUI/src/views/acc/sell/list.vue
@@ -215,7 +215,16 @@
         </tr>
       </template>
     </v-data-table-server>
-
+    <div class="footer-summary">
+    <div class="summary-item">
+      <span class="summary-label">جمع کل فاکتورهای صفحه:</span>
+      <span class="summary-value">{{ $filters.formatNumber(sumTotal) }}</span>
+    </div>
+    <div class="summary-item">
+      <span class="summary-label">جمع موارد انتخاب شده:</span>
+      <span class="summary-value">{{ $filters.formatNumber(sumSelected) }}</span>
+    </div>
+  </div>
     <v-dialog v-model="showColumnDialog" max-width="500px">
       <v-card>
         <v-toolbar dark>
@@ -684,12 +693,15 @@ export default defineComponent({
     itemsSelected: {
       handler(val) {
         this.sumSelected = 0;
-        this.itemsSelected.forEach((item) => {
-          const amount = item.amount || 0;
-          if (typeof amount === "string") {
-            this.sumSelected += parseInt(amount.replaceAll(",", "") || 0);
-          } else {
-            this.sumSelected += amount;
+        this.itemsSelected.forEach((code) => {
+          const selectedItem = this.items.find(item => item.code === code);
+          if (selectedItem) {
+            const amount = selectedItem.amount || 0;
+            if (typeof amount === "string") {
+              this.sumSelected += parseInt(amount.replaceAll(",", "") || 0);
+            } else {
+              this.sumSelected += amount;
+            }
           }
         });
       },
@@ -700,4 +712,32 @@ export default defineComponent({
 </script>
 
 <style>
+.footer-summary {
+  background-color: #f5f5f5;
+  padding: 12px 24px;
+  display: flex;
+  justify-content: space-between;
+  border-top: 1px solid #e0e0e0;
+  margin-top: 8px;
+}
+
+.summary-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.summary-label {
+  font-weight: 500;
+  color: #666;
+}
+
+.summary-value {
+  font-weight: bold;
+  color: #1976d2;
+}
+
+.data-table-wrapper {
+  margin-bottom: 0;
+}
 </style>
\ No newline at end of file
diff --git a/webUI/src/views/acc/sell/mod.vue b/webUI/src/views/acc/sell/mod.vue
old mode 100755
new mode 100644
index aaab631..83967f1
--- a/webUI/src/views/acc/sell/mod.vue
+++ b/webUI/src/views/acc/sell/mod.vue
@@ -3,1188 +3,1380 @@
     <template v-slot:prepend>
       <v-tooltip :text="$t('dialog.back')" location="bottom">
         <template v-slot:activator="{ props }">
-          <v-btn v-bind="props" @click="$router.back()" class="d-none d-sm-flex" variant="text"
-            icon="mdi-arrow-right" />
+          <v-btn v-bind="props" @click="$router.back()" class="d-none d-sm-flex" variant="text" icon="mdi-arrow-right" />
         </template>
       </v-tooltip>
     </template>
     <v-spacer></v-spacer>
-    <v-switch :disabled="this.selectedPersonWithDet.mobile == '' || this.selectedPersonWithDet.mobile == undefined"
-      v-model="sms" :label="$t('dialog.sms')" color="primary" hide-details="true" </v-switch>
-      <v-btn :disabled="this.canSubmit != true" @click="save()" :loading="loading" icon="" color="green">
-        <v-tooltip activator="parent" :text="$t('dialog.save')" location="bottom" />
-        <v-icon icon="mdi-content-save"></v-icon>
-      </v-btn>
-      <template v-slot:extension>
-        <v-tabs color="primary" class="bg-light" grow v-model="tabs">
-          <v-tab value="0">
-            {{ $t('dialog.invoice_info') }}
-          </v-tab>
-          <v-tab value="1">
-            {{ $t('dialog.comsofinvoice') }}
-          </v-tab>
-          <v-tab value="2">
-            {{ $t('dialog.pair_docs') }}
-          </v-tab>
-        </v-tabs>
+    <v-tooltip text="ثبت فاکتور" location="bottom">
+      <template v-slot:activator="{ props }">
+        <v-btn v-bind="props" variant="text" icon="mdi-content-save" color="success" @click="saveInvoice" :loading="loading"></v-btn>
       </template>
+    </v-tooltip>
+    <v-tooltip v-if="$route.params.id" text="حذف فاکتور" location="bottom">
+      <template v-slot:activator="{ props }">
+        <v-btn v-bind="props" variant="text" icon="mdi-delete" color="error" @click="deleteInvoice" :loading="loading"></v-btn>
+      </template>
+    </v-tooltip>
   </v-toolbar>
-  <v-row class="pa-1">
-    <v-col>
-      <v-tabs-window v-model="tabs">
-        <v-tabs-window-item value="0">
-          <v-card>
-            <v-card-text>
-              <div class="row">
-                <div class="col-sm-12 col-md-6 mb-1">
-                  <div class="block block-rounded border">
-                    <div class="block-header block-header-default py-1">
-                      <h3 class="block-title text-primary">
-                        <i class="fa fa-calendar"></i>
-                        تاریخ
-                      </h3>
-                      <div class="block-options">
+  <v-container fluid class="pa-0">
+    <v-row>
+      <v-col cols="12">
+        <v-tabs v-model="activeTab" color="primary" class="w-100 tabs-container">
+          <v-tab value="invoice" class="flex-grow-1">فاکتور</v-tab>
+          <v-tab value="payments" class="flex-grow-1">اسناد پرداخت</v-tab>
+          <v-tab value="settings" class="flex-grow-1">تنظیمات جانبی</v-tab>
+        </v-tabs>
 
-                      </div>
-                    </div>
-                    <div class="block-content pt-1 px-1">
-                      <p>
-                        <date-picker class="" v-model="data.date" format="jYYYY/jMM/jDD" display-format="jYYYY/jMM/jDD"
-                          :min="year.start" :max="year.end" />
-                      </p>
-                    </div>
-                  </div>
-                </div>
-                <div class="col-sm-12 col-md-6 mb-1">
-                  <div class="block block-rounded border">
-                    <div class="block-header block-header-default py-1">
-                      <h3 class="block-title text-primary">
-                        <i class="fa fa-person"></i>
-                        طرف حساب
-                      </h3>
-                      <div class="block-options">
-                        <quickView :code="this.data.person.code"></quickView>
-                        <quickAdd :code="this.data.person.code"></quickAdd>
-                      </div>
-                    </div>
-                    <div class="block-content pt-1 px-1">
-                      <v-cob class="mb-1 mx-0" :filterable="false" dir="rtl" @search="searchPerson" :options="persons"
-                        label="nikename" v-model="data.person">
-                        <template #no-options="{ search, searching, loading }">
-                          نتیجه‌ای یافت نشد!
-                        </template>
-                        <template v-slot:option="option">
-                          <div class="row mb-1">
-                            <div class="col-12">
-                              <i class="fa fa-user me-2"></i>
-                              {{ option.nikename }}
-                            </div>
-                            <div class="col-12">
-                              <div class="row">
-                                <div class="col-6">
-                                  <i class="fa fa-phone me-2"></i>
-                                  {{ option.mobile }}
-                                </div>
-                                <div class="col-6">
-                                  <i class="fa fa-bars"></i>
-                                  تراز:
-                                  {{ $filters.formatNumber(Math.abs(parseInt(option.bs) -
-                                    parseInt(option.bd))) }}
-                                  <span class="text-danger" v-if="parseInt(option.bs) - parseInt(option.bd) < 0">
-                                    بدهکار </span>
-                                  <span class="text-success" v-if="parseInt(option.bs) - parseInt(option.bd) > 0">
-                                    بستانکار </span>
-                                </div>
-                              </div>
-                            </div>
+        <v-window v-model="activeTab" class="mt-3">
+          <!-- تب فاکتور -->
+          <v-window-item value="invoice">
+            <v-row class="ma-1">
+              <v-col cols="12" sm="12">
+                <v-row class="mb-2">
+                  <v-col cols="12" sm="6">
+                    <Hdatepicker v-model="invoiceDate" label="تاریخ فاکتور" density="compact"></Hdatepicker>
+                  </v-col>
+                  <v-col cols="12" sm="6">
+                    <Hpersonsearch v-model="customer" label="خریدار" :rules="[v => !!v || 'خریدار الزامی است']" required></Hpersonsearch>
+                  </v-col>
+                </v-row>
+                <v-text-field v-model="invoiceDescription" label="توضیحات فاکتور" density="compact" hide-details class="mb-4">
+                  <template v-slot:prepend-inner>
+                    <mostdes v-model="invoiceDescription" :submitData="{ id: null, des: invoiceDescription }" type="sell" label=""></mostdes>
+                  </template>
+                </v-text-field>
+                <v-table class="border rounded d-none d-sm-table" style="width: 100%;">
+                  <thead>
+                    <tr style="background-color: #0D47A1; color: white;">
+                      <th class="text-center">نام کالا</th>
+                      <th class="text-center">تعداد</th>
+                      <th class="text-center">قیمت</th>
+                      <th class="text-center">تخفیف</th>
+                      <th class="text-center" style="width: 150px;">جمع کل</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <template v-for="(item, index) in items" :key="index">
+                      <tr :style="{ backgroundColor: index % 2 === 0 ? '#f8f9fa' : 'white', height: '64px' }">
+                        <td class="text-center" style="min-width: 200px;">
+                          <Hcommoditysearch v-model="item.name" density="compact" hide-details class="my-0" style="font-size: 0.8rem;" return-object></Hcommoditysearch>
+                        </td>
+                        <td class="text-center" style="width: 100px;">
+                          <Hnumberinput v-model="item.count" density="compact" @update:modelValue="recalculateTotals" class="my-0" style="font-size: 0.8rem;"></Hnumberinput>
+                        </td>
+                        <td class="text-center" style="width: 120px;">
+                          <Hnumberinput v-model="item.price" density="compact" @update:modelValue="recalculateTotals" class="my-0" style="font-size: 0.8rem;"></Hnumberinput>
+                        </td>
+                        <td class="text-center" style="width: 150px;">
+                          <div class="d-flex align-center">
+                            <Hnumberinput v-if="item.showPercentDiscount" v-model="item.discountPercent" density="compact" suffix="%" @update:modelValue="recalculateTotals" class="my-0" style="font-size: 0.8rem;">
+                              <template v-slot:prepend>
+                                <v-tooltip text="تخفیف درصدی" location="bottom">
+                                  <template v-slot:activator="{ props }">
+                                    <v-checkbox v-bind="props" v-model="item.showPercentDiscount" hide-details density="compact" color="primary" class="mt-0" @update:modelValue="handleDiscountTypeChange(item)"></v-checkbox>
+                                  </template>
+                                </v-tooltip>
+                              </template>
+                            </Hnumberinput>
+                            <Hnumberinput v-else v-model="item.discountAmount" density="compact" @update:modelValue="recalculateTotals" class="my-0" style="font-size: 0.8rem;">
+                              <template v-slot:prepend>
+                                <v-tooltip text="تخفیف مبلغی" location="bottom">
+                                  <template v-slot:activator="{ props }">
+                                    <v-checkbox v-bind="props" v-model="item.showPercentDiscount" hide-details density="compact" color="primary" class="mt-0" @update:modelValue="handleDiscountTypeChange(item)"></v-checkbox>
+                                  </template>
+                                </v-tooltip>
+                              </template>
+                            </Hnumberinput>
                           </div>
-                        </template>
-                      </v-cob>
-                      <span v-if="selectedPersonWithDet.bs != undefined" class="text-info ms-2">
-                        تراز:
-                        {{ $filters.formatNumber(Math.abs(parseInt(this.selectedPersonWithDet.bs) -
-                          parseInt(this.selectedPersonWithDet.bd))) }}
-                        <span class="text-danger"
-                          v-if="parseInt(this.selectedPersonWithDet.bs) - parseInt(this.selectedPersonWithDet.bd) < 0">
-                          بدهکار </span>
-                        <span class="text-success"
-                          v-if="parseInt(this.selectedPersonWithDet.bs) - parseInt(this.selectedPersonWithDet.bd) > 0">
-                          بستانکار </span>
-                      </span>
-                    </div>
-                  </div>
-                </div>
-                <div class="col-sm-12 col-md-12 mb-1">
-                  <div class="block block-rounded border">
-                    <div class="block-header block-header-default py-1">
-                      <h3 class="block-title text-primary">
-                        <i class="fa-regular fa-note-sticky"></i>
-                        شرح
-                      </h3>
-                      <div class="block-options">
-                        <mostdes :submitData="desSubmit" type="sell"></mostdes>
-                      </div>
-                    </div>
-                    <div class="block-content p-0">
-                      <input v-model="data.des" class="form-control" type="text">
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </v-card-text>
-          </v-card>
-        </v-tabs-window-item>
-        <v-tabs-window-item value="1">
-          <v-card>
-            <v-card-text>
-              <div class="row">
-                <div class="col-12">
-                  <v-bottom-sheet fullscreen inset class="float-start" v-model="addsheet">
-                    <template v-slot:activator="{ props }">
-                      <v-btn v-bind="props" color="primary" class="">
-                        <v-icon>mdi-plus</v-icon>
-                        {{ $t('dialog.add_row') }}
-                      </v-btn>
-                    </template>
-                    <v-card class="bg-white" :loading="loading">
-                      <v-toolbar color="toolbar" :title="$t('drawer.commodity')">
-                        <template v-slot:prepend>
-                          <v-tooltip :text="$t('dialog.back')" location="bottom">
+                        </td>
+                        <td class="text-center font-weight-bold" style="width: 120px;">
+                          {{ item.total.toLocaleString('fa-IR') }}
+                        </td>
+                      </tr>
+                      <tr :style="{ backgroundColor: index % 2 === 0 ? '#f8f9fa' : 'white', height: '64px' }">
+                        <td colspan="4">
+                          <v-text-field v-model="item.description" density="compact" hide-details placeholder="شرح" class="my-0" style="font-size: 0.8rem;">
+                            <template v-slot:prepend-inner>
+                              <mostdes v-model="item.description" :submitData="{ id: null, des: item.description }" type="sell" label=""></mostdes>
+                            </template>
+                          </v-text-field>
+                        </td>
+                        <td class="text-center" style="width: 120px;">
+                          <v-tooltip text="حذف" location="bottom">
                             <template v-slot:activator="{ props }">
-                              <v-btn icon="mdi-close" @click="addsheet = !addsheet"></v-btn>
+                              <v-btn v-bind="props" icon="mdi-delete" variant="text" size="small" color="error" @click="removeItem(index)"></v-btn>
+                            </template>
+                          </v-tooltip>
+                        </td>
+                      </tr>
+                    </template>
+                    <tr>
+                      <td colspan="5" class="text-center pa-2" style="height: 64px;">
+                        <v-btn color="primary" prepend-icon="mdi-plus" size="small" @click="addItem">افزودن سطر جدید</v-btn>
+                      </td>
+                    </tr>
+                  </tbody>
+                </v-table>
+              </v-col>
+            </v-row>
+
+            <!-- جدول موبایل -->
+            <div class="d-sm-none">
+              <v-card v-for="(item, index) in items" :key="index" class="mb-4" variant="outlined">
+                <v-card-text>
+                  <div class="d-flex justify-space-between align-center mb-2">
+                    <span class="text-subtitle-2 font-weight-bold">ردیف:</span>
+                    <span>{{ index + 1 }}</span>
+                  </div>
+                  <div class="mb-2">
+                    <Hcommoditysearch v-model="item.name" density="compact" label="نام کالا" hide-details class="my-0" style="font-size: 0.8rem;" return-object></Hcommoditysearch>
+                  </div>
+                  <div class="d-flex justify-space-between mb-2">
+                    <div style="width: 48%;">
+                      <Hnumberinput v-model="item.count" density="compact" label="تعداد" hide-details class="my-0" style="font-size: 0.8rem;" @update:modelValue="recalculateTotals"></Hnumberinput>
+                    </div>
+                    <div style="width: 48%;">
+                      <Hnumberinput v-model="item.price" density="compact" label="قیمت" hide-details class="my-0" style="font-size: 0.8rem;" @update:modelValue="recalculateTotals"></Hnumberinput>
+                    </div>
+                  </div>
+                  <div class="mb-2">
+                    <div class="d-flex align-center">
+                      <Hnumberinput v-if="item.showPercentDiscount" v-model="item.discountPercent" density="compact" label="تخفیف" suffix="%" hide-details @update:modelValue="recalculateTotals" class="my-0" style="font-size: 0.8rem;">
+                        <template v-slot:prepend>
+                          <v-tooltip text="تخفیف درصدی" location="bottom">
+                            <template v-slot:activator="{ props }">
+                              <v-checkbox v-bind="props" v-model="item.showPercentDiscount" hide-details density="compact" color="primary" class="mt-0" @update:modelValue="handleDiscountTypeChange(item)"></v-checkbox>
                             </template>
                           </v-tooltip>
                         </template>
-                        <v-spacer></v-spacer>
-                        <v-btn :loading="loading" @click="addItem()" icon="" color="green">
-                          <v-tooltip activator="parent" :text="$t('dialog.save')" location="bottom" />
-                          <v-icon icon="mdi-content-save"></v-icon>
-                        </v-btn>
-                      </v-toolbar>
-                      <v-row class="pa-2 my-auto">
-                        <v-col cols="12" sm="12" md="12">
-                          <div class="container">
-                            <div class="row">
-                              <div class="col-sm-12 col-md-6 mb-0">
-                                <div class="block block-rounded border">
-                                  <div class="block-header block-header-default py-1">
-                                    <h3 class="block-title text-primary">
-                                      <i class="fa fa-box pe-2"></i>
-                                      کالا و خدمات
-                                    </h3>
-                                    <div class="block-options">
-                                      <!-- Button trigger modal -->
-                                      <quickAddCommodity></quickAddCommodity>
-                                    </div>
-                                  </div>
-                                  <div class="block-content pt-1 px-1">
-                                    <v-cob dir="rtl" @search="searchCommodity" :options="commodity" label="name"
-                                      v-model="itemData.commodity" class="">
-                                      <template #no-options="{ search, searching, loading }">
-                                        نتیجه‌ای یافت نشد!
-                                      </template>
-                                      <template v-slot:option="option">
-                                        <div class="row mb-1">
-                                          <div class="col-12">
-                                            <i class="fa fa-box me-1"></i>
-                                            {{ option.name }}
-                                          </div>
-                                          <div class="col-12">
-                                            <small v-if="option.khadamat == false">
-                                              <i class="fa fa-store me-1"></i>
-                                              <small class="text-danger">
-                                                موجودی:
-                                              </small>
-                                              <label style="direction: ltr;">
-                                                {{ option.count }}
-                                              </label>
-                                              {{ option.unit }}
-                                            </small>
-                                          </div>
-                                        </div>
-                                      </template>
-                                    </v-cob>
-
-                                  </div>
-                                </div>
-                              </div>
-                              <div class="col-sm-12 col-md-6 mb-2">
-                                <div class="block block-rounded border">
-                                  <div class="block-header block-header-default py-1">
-                                    <h3 class="block-title text-primary">
-                                      <i class="fa-regular fa-note-sticky"></i>
-                                      شرح
-                                    </h3>
-                                    <div class="block-options">
-
-                                    </div>
-                                  </div>
-                                  <div class="block-content p-0">
-                                    <input v-model="this.itemData.des" class="form-control" type="text">
-                                  </div>
-                                </div>
-                              </div>
-                              <div class="col-sm-12 col-md-6 mb-2">
-                                <div class="form-floating mb-3">
-                                  <money3 v-bind="unitConfig" class="form-control"
-                                    v-model.number="this.itemData.count" />
-                                  <label v-if="itemData.commodity" for="floatingInput">{{
-                                    itemData.commodity.unitData.name
-                                  }}</label>
-                                </div>
-                              </div>
-                              <div class="col-sm-12 col-md-6 mb-2">
-                                <div class="input-group mb-3">
-                                  <div class="form-floating mb-3">
-                                    <money3 v-bind="currencyConfig" min=0 class="form-control"
-                                      v-model="this.itemData.price" />
-                                    <label for="floatingInput">قیمت واحد</label>
-                                  </div>
-                                </div>
-                              </div>
-                              <div class="col-sm-12 col-md-6 mb-2">
-                                <div class="form-floating mb-3">
-                                  <money3 v-bind="currencyConfig" class="form-control"
-                                    v-model.number="this.itemData.discount" />
-                                  <label for="floatingInput">تخفیف</label>
-                                </div>
-                              </div>
-                              <div class="col-sm-12 col-md-6 mb-2">
-                                <div class="form-floating mb-3">
-                                  <money3 readonly="readonly" v-bind="currencyConfig" class="form-control"
-                                    v-model.number="this.itemData.sumWithoutTax" />
-                                  <label for="floatingInput">قیمت کل</label>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </v-col>
-                      </v-row>
-                    </v-card>
-                  </v-bottom-sheet>
-                  <v-bottom-sheet fullscreen inset class="float-start" v-model="editsheet">
-                    <v-card class="bg-white" :loading="loading">
-                      <v-toolbar color="toolbar" :title="$t('drawer.commodity')">
+                      </Hnumberinput>
+                      <Hnumberinput v-else v-model="item.discountAmount" density="compact" label="تخفیف" hide-details @update:modelValue="recalculateTotals" class="my-0" style="font-size: 0.8rem;">
                         <template v-slot:prepend>
-                          <v-tooltip :text="$t('dialog.back')" location="bottom">
+                          <v-tooltip text="تخفیف مبلغی" location="bottom">
                             <template v-slot:activator="{ props }">
-                              <v-btn icon="mdi-close" @click="editsheet = !editsheet"></v-btn>
+                              <v-checkbox v-bind="props" v-model="item.showPercentDiscount" hide-details density="compact" color="primary" class="mt-0" @update:modelValue="handleDiscountTypeChange(item)"></v-checkbox>
                             </template>
                           </v-tooltip>
                         </template>
-                        <v-spacer></v-spacer>
-                        <v-btn :loading="loading" @click="doEditeItem()" icon="" color="green">
-                          <v-tooltip activator="parent" :text="$t('dialog.save')" location="bottom" />
-                          <v-icon icon="mdi-content-save"></v-icon>
-                        </v-btn>
-                      </v-toolbar>
-                      <div class="row pa-2">
-                        <div class="col-sm-12 col-md-6 mb-0">
-                          <div class="block block-rounded border">
-                            <div class="block-header block-header-default py-1">
-                              <h3 class="block-title text-primary">
-                                <i class="fa fa-box pe-2"></i>
-                                کالا و خدمات
-                              </h3>
-                              <div class="block-options">
-                                <!-- Button trigger modal -->
-                                <quickAddCommodity></quickAddCommodity>
-                              </div>
-                            </div>
-                            <div class="block-content pt-1 px-1">
-                              <v-cob dir="rtl" @search="searchCommodity" :options="commodity" label="name"
-                                v-model="editItemData.commodity" class="">
-                                <template #no-options="{ search, searching, loading }">
-                                  نتیجه‌ای یافت نشد!
-                                </template>
-                                <template v-slot:option="option">
-                                  <div class="row mb-1">
-                                    <div class="col-12">
-                                      <i class="fa fa-box me-1"></i>
-                                      {{ option.name }}
-                                    </div>
-                                    <div class="col-12">
-                                      <small v-if="option.khadamat == false">
-                                        <i class="fa fa-store me-1"></i>
-                                        <small class="text-danger">
-                                          موجودی:
-                                        </small>
-                                        <label style="direction: ltr;">
-                                          {{ option.count }}
-                                        </label>
-                                        {{ option.unit }}
-                                      </small>
-                                    </div>
-                                  </div>
-                                </template>
-                              </v-cob>
-
-                            </div>
-                          </div>
-                        </div>
-                        <div class="col-sm-12 col-md-6 mb-2">
-                          <div class="block block-rounded border">
-                            <div class="block-header block-header-default py-1">
-                              <h3 class="block-title text-primary">
-                                <i class="fa-regular fa-note-sticky"></i>
-                                شرح
-                              </h3>
-                              <div class="block-options">
-
-                              </div>
-                            </div>
-                            <div class="block-content p-0">
-                              <input v-model="this.editItemData.des" class="form-control" type="text">
-                            </div>
-                          </div>
-                        </div>
-                        <div class="col-sm-12 col-md-6 mb-2">
-                          <div class="form-floating mb-3">
-                            <money3 v-bind="unitConfig" class="form-control" v-model.number="this.editItemData.count" />
-                            <label v-if="editItemData.commodity" for="floatingInput">{{
-                              editItemData.commodity.unitData.name
-                            }}</label>
-                          </div>
-                        </div>
-                        <div class="col-sm-12 col-md-6 mb-2">
-                          <div class="input-group mb-3">
-                            <div class="form-floating mb-3">
-                              <money3 v-bind="currencyConfig" min=0 class="form-control"
-                                v-model="this.editItemData.price" />
-                              <label for="floatingInput">قیمت واحد</label>
-                            </div>
-                          </div>
-                        </div>
-                        <div class="col-sm-12 col-md-6 mb-2">
-                          <div class="form-floating mb-3">
-                            <money3 v-bind="currencyConfig" class="form-control"
-                              v-model.number="this.editItemData.discount" />
-                            <label for="floatingInput">تخفیف</label>
-                          </div>
-                        </div>
-                        <div class="col-sm-12 col-md-6 mb-2">
-                          <div class="form-floating mb-3">
-                            <money3 readonly="readonly" v-bind="currencyConfig" class="form-control"
-                              v-model.number="this.editItemData.sumWithoutTax" />
-                            <label for="floatingInput">قیمت کل</label>
-                          </div>
-                        </div>
+                      </Hnumberinput>
+                    </div>
+                  </div>
+                  <div class="mb-2">
+                    <v-text-field v-model="item.description" density="compact" label="شرح" hide-details class="my-0" style="font-size: 0.8rem;">
+                      <template v-slot:prepend-inner>
+                        <mostdes v-model="item.description" :submitData="{ id: null, des: item.description }" type="sell" label=""></mostdes>
+                      </template>
+                    </v-text-field>
+                  </div>
+                  <div class="d-flex justify-space-between align-center">
+                    <span class="text-subtitle-2 font-weight-bold">جمع کل:</span>
+                    <span class="text-subtitle-2 font-weight-bold">{{ item.total.toLocaleString('fa-IR') }}</span>
+                  </div>
+                </v-card-text>
+                <v-card-actions>
+                  <v-spacer></v-spacer>
+                  <v-btn icon="mdi-delete" variant="text" color="error" @click="removeItem(index)"></v-btn>
+                </v-card-actions>
+              </v-card>
+              <v-btn color="primary" prepend-icon="mdi-plus" block class="mb-4" @click="addItem">افزودن کالای جدید</v-btn>
+            </div>
+            <v-card class="mt-4 mx-2 border pa-4">
+              <v-row>
+                <v-col cols="12" sm="6">
+                  <v-row>
+                    <v-col cols="12">
+                      <Hnumberinput v-model="taxPercent" label="مالیات بر ارزش افزوده" density="compact" hide-details suffix="%" @update:modelValue="recalculateTotals"></Hnumberinput>
+                    </v-col>
+                    <v-col cols="12">
+                      <div class="d-flex align-center">
+                        <Hnumberinput v-if="showTotalPercentDiscount" v-model="totalDiscountPercent" density="compact" label="تخفیف کلی" hide-details suffix="%" @update:modelValue="recalculateTotals">
+                          <template v-slot:prepend>
+                            <v-tooltip text="تخفیف درصدی" location="bottom">
+                              <template v-slot:activator="{ props }">
+                                <v-checkbox v-bind="props" v-model="showTotalPercentDiscount" hide-details density="compact" color="primary" class="mt-0"></v-checkbox>
+                              </template>
+                            </v-tooltip>
+                          </template>
+                        </Hnumberinput>
+                        <Hnumberinput v-else v-model="totalDiscount" density="compact" label="تخفیف کلی" hide-details @update:modelValue="recalculateTotals">
+                          <template v-slot:prepend>
+                            <v-tooltip text="تخفیف مبلغی" location="bottom">
+                              <template v-slot:activator="{ props }">
+                                <v-checkbox v-bind="props" v-model="showTotalPercentDiscount" hide-details density="compact" color="primary" class="mt-0"></v-checkbox>
+                              </template>
+                            </v-tooltip>
+                          </template>
+                        </Hnumberinput>
                       </div>
+                    </v-col>
+                    <v-col cols="12">
+                      <Hnumberinput v-model="shippingCost" density="compact" label="هزینه حمل" hide-details @update:modelValue="recalculateTotals"></Hnumberinput>
+                    </v-col>
+                  </v-row>
+                </v-col>
+                <v-col cols="12" sm="6">
+                  <v-card class="pa-4" color="grey-lighten-4">
+                    <div class="d-flex align-center justify-space-between mb-2">
+                      <span class="text-subtitle-2 font-weight-bold">جمع کل فاکتور:</span>
+                      <span class="text-subtitle-2 font-weight-bold">{{ totalInvoice.toLocaleString('fa-IR') }}</span>
+                    </div>
+                    <div class="d-flex align-center justify-space-between mb-2">
+                      <span class="text-subtitle-2 font-weight-bold">تخفیف کلی:</span>
+                      <span class="text-subtitle-2 font-weight-bold">{{ (showTotalPercentDiscount ? Math.round((totalInvoice * totalDiscountPercent) / 100) : totalDiscount).toLocaleString('fa-IR') }}</span>
+                    </div>
+                    <div class="d-flex align-center justify-space-between mb-2">
+                      <span class="text-subtitle-2 font-weight-bold">هزینه حمل:</span>
+                      <span class="text-subtitle-2 font-weight-bold">{{ shippingCost.toLocaleString('fa-IR') }}</span>
+                    </div>
+                    <div class="d-flex align-center justify-space-between mb-2">
+                      <span class="text-subtitle-2 font-weight-bold">جمع کل با تخفیف و حمل:</span>
+                      <span class="text-subtitle-2 font-weight-bold">{{ (totalInvoice - (showTotalPercentDiscount ? Math.round((totalInvoice * totalDiscountPercent) / 100) : totalDiscount) + shippingCost).toLocaleString('fa-IR') }}</span>
+                    </div>
+                    <div class="d-flex align-center justify-space-between mb-2">
+                      <span class="text-subtitle-2 font-weight-bold">مبلغ مالیات:</span>
+                      <span class="text-subtitle-2 font-weight-bold">{{ taxAmount.toLocaleString('fa-IR') }}</span>
+                    </div>
+                    <div class="d-flex align-center justify-space-between mb-2">
+                      <span class="text-subtitle-2 font-weight-bold">جمع کل نهایی:</span>
+                      <span class="text-subtitle-2 font-weight-bold">{{ finalTotal.toLocaleString('fa-IR') }}</span>
+                    </div>
+                  </v-card>
+                </v-col>
+              </v-row>
+            </v-card>
+          </v-window-item>
+
+          <!-- تب اسناد پرداخت -->
+          <v-window-item value="payments">
+            <v-card class="mt-4">
+              <v-card-text>
+                <v-container class="pa-0">
+                  <!-- بخش خلاصه مبالغ -->
+                  <v-row class="mb-4">
+                    <v-col cols="12" md="4">
+                      <v-text-field v-model="totalPayments" label="مجموع پرداخت‌ها" readonly density="compact" hide-details variant="outlined" bg-color="grey-lighten-4"></v-text-field>
+                    </v-col>
+                    <v-col cols="12" md="4">
+                      <v-text-field v-model="remainingAmount" label="باقی مانده" readonly density="compact" hide-details variant="outlined" bg-color="grey-lighten-4"></v-text-field>
+                    </v-col>
+                    <v-col cols="12" md="4">
+                      <v-text-field v-model="totalAmount" label="مبلغ کل فاکتور" readonly density="compact" hide-details variant="outlined" bg-color="grey-lighten-4"></v-text-field>
+                    </v-col>
+                  </v-row>
+
+                  <!-- بخش لیست پرداخت‌ها -->
+                  <div v-if="paymentItems.length === 0" class="text-center pa-8">
+                    <v-icon size="large" color="grey" class="mb-2">mdi-cash-remove</v-icon>
+                    <div class="text-subtitle-1 text-grey">هیچ پرداختی ثبت نشده است.</div>
+                  </div>
+
+                  <v-row v-else>
+                    <v-col v-for="(item, index) in paymentItems" :key="index" cols="12">
+                      <v-card :class="{
+                        'bank-card': item.type === 'bank',
+                        'cashdesk-card': item.type === 'cashdesk',
+                        'salary-card': item.type === 'salary',
+                        'cheque-card': item.type === 'cheque'
+                      }" border="sm" class="mb-0 payment-card">
+                        <v-card-item class="py-0">
+                          <template v-slot:prepend>
+                            <v-icon :color="item.type === 'bank' ? 'blue' : item.type === 'cashdesk' ? 'green' : item.type === 'salary' ? 'orange' : 'purple'" size="small">
+                              {{ item.type === 'bank' ? 'mdi-bank' : item.type === 'cashdesk' ? 'mdi-cash-register' : item.type === 'salary' ? 'mdi-wallet' : 'mdi-checkbook' }}
+                            </v-icon>
+                          </template>
+
+                          <v-card-title class="text-subtitle-2 py-0">
+                            {{ item.type === 'bank' ? 'حساب بانکی' : item.type === 'cashdesk' ? 'صندوق' : item.type === 'salary' ? 'تنخواه گردان' : 'چک' }}
+                          </v-card-title>
+
+                          <template v-slot:append>
+                            <v-btn-group density="compact">
+                              <v-btn variant="text" color="primary" size="small" @click="fillWithTotal(item)">
+                                <v-icon size="small">mdi-cash-100</v-icon>
+                                <v-tooltip activator="parent" location="bottom">کل فاکتور</v-tooltip>
+                              </v-btn>
+                              <v-btn variant="text" color="error" size="small" @click="deletePaymentItem(index)">
+                                <v-icon size="small">mdi-trash-can</v-icon>
+                                <v-tooltip activator="parent" location="bottom">حذف</v-tooltip>
+                              </v-btn>
+                            </v-btn-group>
+                          </template>
+                        </v-card-item>
+
+                        <v-divider class="my-0"></v-divider>
+
+                        <v-card-text class="py-2">
+                          <v-row class="mt-0">
+                            <v-col cols="12" sm="6">
+                              <Hbankaccountsearch v-if="item.type === 'bank'" v-model="item.bank" label="بانک" density="compact" variant="outlined"></Hbankaccountsearch>
+                              <Hcashdesksearch v-if="item.type === 'cashdesk'" v-model="item.cashdesk" label="صندوق" density="compact" variant="outlined"></Hcashdesksearch>
+                              <Hsalarysearch v-if="item.type === 'salary'" v-model="item.salary" label="تنخواه گردان" density="compact" variant="outlined"></Hsalarysearch>
+                            </v-col>
+                            <v-col cols="12" sm="6">
+                              <Hnumberinput v-model="item.amount" label="مبلغ" placeholder="0" @update:modelValue="calculatePayments" density="compact" variant="outlined" />
+                            </v-col>
+                            <v-col cols="12" sm="6">
+                              <v-text-field v-model="item.reference" label="ارجاع" density="compact" variant="outlined"></v-text-field>
+                            </v-col>
+                            <v-col cols="12" sm="6">
+                              <v-text-field v-model="item.description" label="شرح" density="compact" variant="outlined"></v-text-field>
+                            </v-col>
+                          </v-row>
+                        </v-card-text>
+                      </v-card>
+                    </v-col>
+                  </v-row>
+
+                  <!-- دکمه افزودن پرداخت -->
+                  <v-btn color="primary" prepend-icon="mdi-plus" class="mt-4" @click="showPaymentMenu = true">
+                    افزودن پرداخت
+                  </v-btn>
+
+                  <!-- دیالوگ افزودن پرداخت -->
+                  <v-dialog v-model="showPaymentMenu" max-width="300">
+                    <v-card>
+                      <v-card-title class="text-h6 pa-4">
+                        <v-icon icon="mdi-plus-circle" class="ml-2"></v-icon>
+                        افزودن پرداخت
+                      </v-card-title>
+                      <v-divider class="my-0"></v-divider>
+                      <v-list>
+                        <v-list-item @click="addPaymentItem('bank')">
+                          <template v-slot:prepend>
+                            <v-icon color="blue">mdi-bank</v-icon>
+                          </template>
+                          <v-list-item-title>حساب بانکی</v-list-item-title>
+                        </v-list-item>
+                        <v-list-item @click="addPaymentItem('cashdesk')">
+                          <template v-slot:prepend>
+                            <v-icon color="green">mdi-cash-register</v-icon>
+                          </template>
+                          <v-list-item-title>صندوق</v-list-item-title>
+                        </v-list-item>
+                        <v-list-item @click="addPaymentItem('salary')">
+                          <template v-slot:prepend>
+                            <v-icon color="orange">mdi-wallet</v-icon>
+                          </template>
+                          <v-list-item-title>تنخواه گردان</v-list-item-title>
+                        </v-list-item>
+                      </v-list>
                     </v-card>
-                  </v-bottom-sheet>
+                  </v-dialog>
+                </v-container>
+              </v-card-text>
+            </v-card>
+          </v-window-item>
 
-                  <EasyDataTable table-class-name="customize-table" class="mt-3" v-model:items-selected="itemsSelected"
-                    show-index alternating :headers="headers" :items="items" theme-color="#1d90ff"
-                    header-text-direction="center" body-text-direction="center" rowsPerPageMessage="تعداد سطر"
-                    emptyMessage="هیچ آیتمی به این فاکتور افزوده نشده است." rowsOfPageSeparatorMessage="از">
-                    <template #item-operation="{ index }">
-                      <button title="حذف" class="btn btn-sm text-danger px-1" @click="deleteItem(index)">
-                        <i class="fa fa-trash"></i>
-                      </button>
-                      <button title="ویرایش" class="btn btn-sm text-info px-1"
-                        @click="editItem(index); editsheet = true;">
-                        <i class="fa fa-edit"></i>
-                      </button>
-                    </template>
-                    <template #item-sumTotal="{ sumTotal }">
-                      {{ $filters.formatNumber(sumTotal) }}
-                    </template>
-                    <template #item-sumWithoutTax="{ sumWithoutTax }">
-                      {{ $filters.formatNumber(sumWithoutTax) }}
-                    </template>
-                    <template #item-price="{ price }">
-                      {{ $filters.formatNumber(price) }}
-                    </template>
-                    <template #item-commodity.name="{ commodity }">
-                      {{ commodity.code }} - {{ commodity.name }}
-                    </template>
-                    <template #item-tax="{ tax }">
-                      {{ $filters.formatNumber(tax) }}
-                    </template>
-                    <template #item-discount="{ discount }">
-                      {{ $filters.formatNumber(discount) }}
-                    </template>
-                    <template #item-count="{ count, commodity }">
-                      {{ count }} {{ commodity.unit }}
-                    </template>
-                  </EasyDataTable>
-                  <div class="row mt-2">
-                    <div class="col-sm-12 col-md-4">
-                      <div class="input-group input-group-sm mb-2">
-                        <span class="input-group-text" id="inputGroup-sizing-sm">
-                          <input v-model="maliyatCheck" class="form-check-input mt-0 me-2" type="checkbox"
-                            aria-label="Checkbox for following text input">
-                          مالیات
-                          %
-                        </span>
-                        <money3 :disabled="!maliyatCheck" v-bind="unitConfig" aria-label="مالیات بر ارزش افزوده"
-                          class="form-control" v-model.number="maliyatPercent" />
-                      </div>
-                    </div>
-                    <div class="col-sm-12 col-md-4">
-                      <div class="input-group input-group-sm mb-2">
-                        <span class="input-group-text" id="inputGroup-sizing-sm">
-                          تخفیف
-                        </span>
-                        <money3 v-bind="currencyConfig" aria-label="تخفیف روی فاکتور" class="form-control"
-                          v-model.number="data.discountAll" />
-                      </div>
-                    </div>
-                    <div class="col-sm-12 col-md-4">
-                      <div class="input-group input-group-sm mb-2">
-                        <span class="input-group-text" id="inputGroup-sizing-sm">
-                          حمل و نقل
-                        </span>
-                        <money3 v-bind="currencyConfig" aria-label="مالیات بر ارزش افزوده" class="form-control"
-                          v-model.number="data.transferCost" />
-                      </div>
-                    </div>
-                  </div>
-                  <div class="container-fluid p-0 mx-0 mt-2">
-                    <a class="block block-rounded block-link-shadow border-start border-success border-3"
-                      href="javascript:void(0)">
-                      <div class="block-content block-content-full block-content-sm bg-body-light">
-                        <div class="row">
-                          <div class="col-sm-12 col-md-3">
-                            <span class="text-dark">
-                              <i class="fa fa-list-dots"></i>
-                              اقلام فاکتور:
-                            </span>
-                            <span class="text-primary">
-                              {{ items.length }} قلم
-                            </span>
-                          </div>
-                          <div class="col-sm-12 col-md-3">
-                            <span class="text-dark">
-                              <i class="fa fa-list-dots"></i>
-                              مالیات:
-                            </span>
-                            <span class="text-primary">
-                              {{ $filters.formatNumber(this.sumTax) }}
-                              {{ $filters.getActiveMoney().shortName }}
-                            </span>
-                          </div>
+          <!-- تب تنظیمات جانبی -->
+          <v-window-item value="settings">
+            <v-card class="settings-card">
+              <v-card-text>
+                <v-row>
+                  <v-col cols="12" md="6">
+                    <v-card class="settings-section-card" variant="outlined">
+                      <v-card-title class="settings-section-title">
+                        <v-icon icon="mdi-message-text" class="ml-2" color="primary"></v-icon>
+                        <span class="text-subtitle-1 font-weight-bold">تنظیمات پیامک</span>
+                      </v-card-title>
+                      <v-card-text class="settings-section-content">
+                        <v-switch
+                          v-model="sendSmsToCustomer"
+                          color="primary"
+                          label="ارسال پیامک به مشتری"
+                          hide-details
+                          class="mb-0"
+                        ></v-switch>
+                      </v-card-text>
+                    </v-card>
+                  </v-col>
 
-                          <div class="col-sm-12 col-md-3">
-                            <span class="text-dark">
-                              <i class="fa fa-list-check"></i>
-                              جمع مبلغ موارد انتخابی:
-                            </span>
-                            <span class="text-primary">
-                              {{ $filters.formatNumber(this.sumSelected) }}
-                              {{ $filters.getActiveMoney().shortName }}
-                            </span>
-                          </div>
-                          <div class="col-sm-12 col-md-3">
-                            <span class="text-dark">
-                              <i class="fa fa-list-dots"></i>
-                              جمع کل:
-                            </span>
-                            <span class="text-primary">
-                              {{ $filters.formatNumber(this.sumTotal) }}
-                              {{ $filters.getActiveMoney().shortName }}
-                            </span>
-                          </div>
-                        </div>
-                      </div>
-                    </a>
-                  </div>
-                </div>
-              </div>
-            </v-card-text>
-          </v-card>
-        </v-tabs-window-item>
-        <v-tabs-window-item value="2">
-          <v-card>
-            <v-card-text>
-              <v-alert color="info" icon="mdi-information-box" :text="$t('info.sell_pairdocs')"
-                variant="tonal"></v-alert>
-              <v-autocomplete :loading="loading" prepend-inner-icon="mdi-file-search" class="mt-2" hide-details="auto"
-                chips closable-chips multiple :label="$t('dialog.search_invoice')" v-model="data.pair_docs"
-                :items="buyDocs" item-title="code" item-value="code">
-                <template v-slot:item="{ props, item }">
-                  <v-list-item v-bind="props" :title="item.title"></v-list-item>
-                </template>
-              </v-autocomplete>
-              <v-table density="compact" class="border">
-                <thead class="bg-gray">
-                  <tr>
-                    <th class="text-center">
-                      {{ $t('dialog.row') }}
-                    </th>
-                    <th class="text-center">
-                      {{ $t('dialog.invoice_num') }}
-                    </th>
-                    <th class="text-center">
-                      {{ $t('dialog.date') }}
-                    </th>
-                    <th class="text-center">
-                      {{ $t('dialog.suplayer') }}
-                    </th>
-                    <th class="text-center">
-                      {{ $t('dialog.commodities') }}
-                    </th>
-                    <th class="text-center">
-                      {{ $t('dialog.amount') }}
-                    </th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr v-for="(item, index) in pair_docs" :key="item.name" class="text-center">
-                    <td>{{ index }}</td>
-                    <td>
-                      <RouterLink :to="'/acc/sell/mod/' + item.code">{{ item.code }}</RouterLink>
-                    </td>
-                    <td>{{ item.date }}</td>
-                    <td>{{ item.person.nikename }}</td>
-                    <td>
-                      <v-chip variant="tonal" class="me-1" size="small" color="primary"
-                        v-for="commodity in item.commodities">
-                        {{ commodity.name }}
-                      </v-chip>
-                    </td>
-                    <td>{{ $filters.formatNumber(item.amount) }}</td>
-                  </tr>
-                </tbody>
-              </v-table>
-            </v-card-text>
-          </v-card>
-        </v-tabs-window-item>
-      </v-tabs-window>
-    </v-col>
-  </v-row>
+                  <v-col cols="12" md="6">
+                    <v-card class="settings-section-card" variant="outlined">
+                      <v-card-title class="settings-section-title">
+                        <v-icon icon="mdi-printer" class="ml-2" color="primary"></v-icon>
+                        <span class="text-subtitle-1 font-weight-bold">تنظیمات چاپ</span>
+                      </v-card-title>
+                      <v-card-text class="settings-section-content">
+                        <v-switch
+                          v-model="cloudPrint"
+                          color="primary"
+                          label="ارسال به پرینتر ابری"
+                          hide-details
+                          class="mb-2"
+                        ></v-switch>
+                        <v-select
+                          v-if="cloudPrint"
+                          v-model="selectedPrinter"
+                          :items="printers"
+                          item-title="name"
+                          item-value="id"
+                          label="انتخاب پرینتر ابری"
+                          density="compact"
+                          variant="outlined"
+                          hide-details
+                          class="mt-2 mb-4"
+                        ></v-select>
+                        <v-divider v-if="cloudPrint" class="mb-4"></v-divider>
+                        <v-switch
+                          v-model="printInvoice"
+                          color="primary"
+                          label="چاپ صورت حساب"
+                          hide-details
+                          class="mb-2"
+                          :disabled="!cloudPrint"
+                        ></v-switch>
+                        <v-switch
+                          v-model="printCashier"
+                          color="primary"
+                          label="چاپ قبض صندوق"
+                          hide-details
+                          class="mb-2"
+                          :disabled="!cloudPrint"
+                        ></v-switch>
+                        <v-switch
+                          v-model="generatePdf"
+                          color="primary"
+                          label="خروجی PDF فاکتور"
+                          hide-details
+                          class="mb-2"
+                        ></v-switch>
+                      </v-card-text>
+                    </v-card>
+                  </v-col>
+                </v-row>
+              </v-card-text>
+            </v-card>
+          </v-window-item>
+        </v-window>
+      </v-col>
+    </v-row>
+  </v-container>
+  <v-snackbar v-model="showError" color="error" timeout="3000">
+    مبلغ تخفیف نمی‌تواند از قیمت پایه بیشتر باشد
+  </v-snackbar>
+  <v-snackbar v-model="showDiscountError" color="error" timeout="3000">
+    مبلغ تخفیف کلی نمی‌تواند از جمع کل فاکتور بیشتر باشد
+  </v-snackbar>
+  <v-snackbar v-model="showError" color="error" timeout="3000">
+    {{ error }}
+  </v-snackbar>
+  <v-snackbar v-model="showSuccess" color="success" timeout="3000">
+    {{ successMessage }}
+  </v-snackbar>
+  <v-snackbar v-model="showValidationErrors" color="error" timeout="3000">
+    <ul class="mb-0">
+      <li v-for="(error, index) in validationErrors" :key="index">{{ error }}</li>
+    </ul>
+  </v-snackbar>
+  <v-overlay :model-value="loading" class="align-center justify-center">
+    <v-progress-circular color="primary" indeterminate></v-progress-circular>
+  </v-overlay>
+
+  <!-- دیالوگ تأیید حذف -->
+  <v-dialog v-model="deleteDialog" max-width="400">
+    <v-card>
+      <v-card-title class="text-h5">
+        حذف فاکتور
+      </v-card-title>
+      <v-card-text>
+        آیا مطمئن هستید که می‌خواهید این فاکتور را حذف کنید؟
+      </v-card-text>
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn color="grey-darken-1" variant="text" @click="deleteDialog = false">
+          انصراف
+        </v-btn>
+        <v-btn color="error" variant="text" @click="confirmDelete" :loading="loading">
+          حذف
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+
+  <!-- دیالوگ تأیید بارگذاری پیش‌نویس -->
+  <v-dialog v-model="showDraftDialog" max-width="500" persistent>
+    <v-card class="draft-dialog">
+      <v-card-title class="draft-dialog-title">
+        <v-icon icon="mdi-file-document-outline" color="primary" class="ml-2"></v-icon>
+        پیش‌نویس فاکتور فروش
+      </v-card-title>
+      
+      <v-divider></v-divider>
+      
+      <v-card-text class="draft-dialog-content">
+        <div class="draft-message">
+          <v-icon icon="mdi-information-outline" color="info" size="large" class="mb-2"></v-icon>
+          <p class="text-body-1">یک پیش‌نویس از فاکتور فروش قبلی موجود است.</p>
+          <p class="text-body-2 text-medium-emphasis">آیا می‌خواهید این پیش‌نویس را بارگذاری کنید؟</p>
+        </div>
+      </v-card-text>
+      
+      <v-divider></v-divider>
+      
+      <v-card-actions class="draft-dialog-actions">
+        <v-btn
+          color="error"
+          variant="outlined"
+          prepend-icon="mdi-delete"
+          @click="discardDraft"
+          class="ml-2"
+        >
+          حذف پیش‌نویس
+        </v-btn>
+        <v-spacer></v-spacer>
+        <v-btn
+          color="primary"
+          variant="elevated"
+          prepend-icon="mdi-file-restore"
+          @click="loadDraft"
+        >
+          بارگذاری پیش‌نویس
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
 </template>
 
-  <script>
-  import axios from "axios";
-  import Swal from "sweetalert2";
-  import { ref } from "vue";
-  import Loading from 'vue-loading-overlay';
-  import 'vue-loading-overlay/dist/css/index.css';
-  import VuePersianDatetimePicker from 'vue-persian-datetime-picker'
-  import quickView from "../component/person/quickView.vue";
-  // import the styles
-  import { Money3 } from "v-money3";
-  import quickAdd from "../component/person/quickAdd.vue";
-  import quickAddCommodity from "../component/commodity/quickAddCommodity.vue";
-  import mostdes from "../component/mostdes.vue";
-  import { format, unformat } from "v-money3";
-  export default {
-    name: "mod",
-    components: {
-      Money3,
-      Loading,
-      quickView,
-      quickAdd,
-      quickAddCommodity,
-      mostdes
+<script>
+import axios from "axios";
+import Hnumberinput from "@/components/forms/Hnumberinput.vue";
+import Hdatepicker from "@/components/forms/Hdatepicker.vue";
+import Hpersonsearch from "@/components/forms/Hpersonsearch.vue";
+import mostdes from "../component/mostdes.vue";
+import Hcommoditysearch from "@/components/forms/Hcommoditysearch.vue";
+import Hbankaccountsearch from "@/components/forms/Hbankaccountsearch.vue";
+import Hcashdesksearch from "@/components/forms/Hcashdesksearch.vue";
+import Hsalarysearch from "@/components/forms/Hsalarysearch.vue";
+import { ref, watch } from 'vue';
+
+export default {
+  name: "mod",
+  components: {
+    Hnumberinput,
+    Hdatepicker,
+    Hpersonsearch,
+    mostdes,
+    Hcommoditysearch,
+    Hbankaccountsearch,
+    Hcashdesksearch,
+    Hsalarysearch
+  },
+  setup() {
+    const activeTab = ref('invoice');
+    const items = ref([]);
+    const totalInvoice = ref(0);
+    const showError = ref(false);
+    const showDiscountError = ref(false);
+    const showPercentDiscount = ref(true);
+    const showTotalPercentDiscount = ref(true);
+    const invoiceDescription = ref('');
+    const invoiceDate = ref(null);
+    const customer = ref(null);
+    const taxPercent = ref(0);
+    const totalDiscount = ref(0);
+    const totalDiscountPercent = ref(0);
+    const shippingCost = ref(0);
+    const finalTotal = ref(0);
+    const totalWithoutTax = ref(0);
+    const taxAmount = ref(0);
+    const loading = ref(false);
+    const error = ref(null);
+    const validationErrors = ref([]);
+    const deleteDialog = ref(false);
+    const showSuccess = ref(false);
+    const successMessage = ref('');
+    const showValidationErrors = ref(false);
+    const paymentDate = ref(null);
+    const paymentDescription = ref('');
+    const totalPayments = ref(0);
+    const remainingAmount = ref(0);
+    const totalAmount = ref(0);
+    const paymentItems = ref([]);
+    const showPaymentMenu = ref(false);
+    const addPaymentBtn = ref(null);
+    const sendSmsToCustomer = ref(false);
+    const printInvoice = ref(false);
+    const printCashier = ref(false);
+    const generatePdf = ref(false);
+    const cloudPrint = ref(false);
+    const printers = ref([]);
+    const selectedPrinter = ref(null);
+    const showDraftDialog = ref(false);
+    const hasChanges = ref(false);
+    const isNewInvoice = ref(true);
+    const isInitializing = ref(true);
+
+    // بارگذاری تنظیمات از لوکال استوریج
+    const loadSettings = () => {
+      try {
+        const settings = localStorage.getItem('sellInvoiceSettings');
+        if (settings) {
+          const parsedSettings = JSON.parse(settings);
+          sendSmsToCustomer.value = parsedSettings.sendSmsToCustomer || false;
+          printInvoice.value = parsedSettings.printInvoice || false;
+          printCashier.value = parsedSettings.printCashier || false;
+          generatePdf.value = parsedSettings.generatePdf || false;
+          cloudPrint.value = parsedSettings.cloudPrint || false;
+          selectedPrinter.value = parsedSettings.selectedPrinter || null;
+        }
+      } catch (error) {
+        console.error('خطا در بارگذاری تنظیمات:', error);
+      }
+    };
+
+    // ذخیره تنظیمات در لوکال استوریج
+    const saveSettings = () => {
+      try {
+        const settings = {
+          sendSmsToCustomer: sendSmsToCustomer.value,
+          printInvoice: printInvoice.value,
+          printCashier: printCashier.value,
+          generatePdf: generatePdf.value,
+          cloudPrint: cloudPrint.value,
+          selectedPrinter: selectedPrinter.value
+        };
+        localStorage.setItem('sellInvoiceSettings', JSON.stringify(settings));
+      } catch (error) {
+        console.error('خطا در ذخیره تنظیمات:', error);
+      }
+    };
+
+    // تماشای تغییرات تنظیمات
+    watch([sendSmsToCustomer, printInvoice, printCashier, generatePdf, cloudPrint, selectedPrinter], () => {
+      saveSettings();
+    });
+
+    return {
+      activeTab,
+      items,
+      totalInvoice,
+      showError,
+      showDiscountError,
+      showPercentDiscount,
+      showTotalPercentDiscount,
+      invoiceDescription,
+      invoiceDate,
+      customer,
+      taxPercent,
+      totalDiscount,
+      totalDiscountPercent,
+      shippingCost,
+      finalTotal,
+      totalWithoutTax,
+      taxAmount,
+      loading,
+      error,
+      validationErrors,
+      deleteDialog,
+      showSuccess,
+      successMessage,
+      showValidationErrors,
+      paymentDate,
+      paymentDescription,
+      totalPayments,
+      remainingAmount,
+      totalAmount,
+      paymentItems,
+      showPaymentMenu,
+      addPaymentBtn,
+      sendSmsToCustomer,
+      printInvoice,
+      printCashier,
+      generatePdf,
+      cloudPrint,
+      printers,
+      selectedPrinter,
+      loadSettings,
+      saveSettings,
+      showDraftDialog,
+      hasChanges,
+      isNewInvoice,
+      isInitializing
+    };
+  },
+  watch: {
+    items: {
+      handler() {
+        if (this.isNewInvoice && !this.isInitializing) {
+          this.hasChanges = true;
+          this.saveDraft();
+        }
+      },
+      deep: true
     },
-    data: () => {
-      return {
-        tabs: 0,
-        buyDocs: [],
-        pair_docs: [],
-        addsheet: false,
-        editsheet: false,
-        priceList: [],
-        selectedPriceList: {
-          id: 0,
-          label: 'پیشفرض'
-        },
-        plugins: {},
-        maliyatCheck: true,
-        maliyatPercent: 0,
-        bid: {
-          maliyatafzode: 0
-        },
-        desSubmit: {
-          id: '',
-          des: ''
-        },
-        sumSelected: 0,
-        sumTax: 0,
-        sumTotal: 0,
-        itemsSelected: [],
-        items: [],
-        headers: [
-          { text: "کالا", value: "commodity.name" },
-          { text: "شرح", value: "des" },
-          { text: "تعداد/مقدار", value: "count" },
-          { text: "مبلغ واحد", value: "price" },
-          { text: "تخفیف", value: "discount" },
-          { text: "مالیات", value: "tax" },
-          { text: "جمع بدون مالیات", value: "sumWithoutTax" },
-          { text: "مبلغ کل", value: "sumTotal" },
-          { text: "عملیات", value: "operation" },
-        ],
-        selectedPersonWithDet: {},
-        loading: false,
-        canSubmit: true,
-        updateID: null,
-        sum: 0,
-        balance: 0,
-        currencyConfig: {
-          masked: false,
-          prefix: '',
-          suffix: 'ریال',
-          thousands: ',',
-          decimal: '.',
-          precision: 0,
-          disableNegative: true,
-          disabled: false,
-          min: 0,
-          max: null,
-          allowBlank: false,
-          minimumNumberOfCharacters: 1,
-          shouldRound: false,
-          focusOnRight: true,
-        },
-        unitConfig: {
-          masked: false,
-          prefix: '',
-          suffix: '',
-          thousands: ',',
-          decimal: '.',
-          precision: 0,
-          disableNegative: true,
-          disabled: false,
-          allowBlank: false,
-          shouldRound: false,
-          focusOnRight: true,
-        },
-        data: {
-          date: '',
-          des: '',
-          person: '',
-          transferCost: 0,
-          discountAll: 0,
-          pair_docs: [],
-        },
-        year: {},
-        persons: [],
-        commodity: [],
-        units: [],
-        itemData: {
-          id: 0,
-          commodity: {
-            unit: '',
-            unitData: {
-              name: '',
-              floatNumber: 0
-            }
-          },
-          count: 0,
-          price: 0,
-          sumTotal: 0,
-          sumWithoutTax: 0,
-          tax: 0,
-          des: '',
-          discount: 0,
-        },
-        editItemData: {
-          index: 0,
-          id: 0,
-          commodity: {
-            unit: '',
-            unitData: {
-              name: '',
-              floatNumber: 0
-            }
-          },
-          count: 0,
-          price: 0,
-          sumTotal: 0,
-          sumWithoutTax: 0,
-          tax: 0,
-          des: '',
-          discount: 0,
-        },
-        sms: false
+    customer() {
+      if (this.isNewInvoice && !this.isInitializing) {
+        this.hasChanges = true;
+        this.saveDraft();
       }
     },
-    watch: {
+    invoiceDate() {
+      if (this.isNewInvoice && !this.isInitializing) {
+        this.hasChanges = true;
+        this.saveDraft();
+      }
+    },
+    invoiceDescription() {
+      if (this.isNewInvoice && !this.isInitializing) {
+        this.hasChanges = true;
+        this.saveDraft();
+      }
+    },
+    taxPercent() {
+      if (this.isNewInvoice && !this.isInitializing) {
+        this.hasChanges = true;
+        this.saveDraft();
+      }
+    },
+    totalDiscount() {
+      if (this.isNewInvoice && !this.isInitializing) {
+        this.hasChanges = true;
+        this.saveDraft();
+      }
+    },
+    totalDiscountPercent() {
+      if (this.isNewInvoice && !this.isInitializing) {
+        this.hasChanges = true;
+        this.saveDraft();
+      }
+    },
+    shippingCost() {
+      if (this.isNewInvoice && !this.isInitializing) {
+        this.hasChanges = true;
+        this.saveDraft();
+      }
+    },
+    paymentItems: {
+      handler() {
+        if (this.isNewInvoice && !this.isInitializing) {
+          this.hasChanges = true;
+          this.saveDraft();
+        }
+      },
+      deep: true
+    }
+  },
+  async mounted() {
+    try {
+      // اول تنظیمات را لود می‌کنیم
+      this.loadSettings();
+      
+      // بررسی وضعیت پیش‌نویس
+      this.isNewInvoice = !this.$route.params.id;
+      
+      // تاریخ را تنظیم می‌کنیم
+      const response = await axios.get('/api/year/get');
+      this.date = response.data.now;
+      this.paymentDate = response.data.now;
 
-      'editItemData.price': function () {
-        this.editCalc();
-      },
-      'editItemData.discount': function () {
-        this.editCalc();
-      },
-      'editItemData.count': function () {
-        this.editCalc();
-      },
-      'editItemData.commodity': function (newVal, oldVal) {
-        if (newVal != '' && newVal != undefined) {
-          this.unitConfig.precision = this.editItemData.commodity.unitData.floatNumber;
-          this.editItemData.des = this.editItemData.commodity.des;
-        }
-      },
-      'desSubmit.id': function () {
-        this.data.des = this.desSubmit.des;
-      },
-      'itemData.price': function () {
-        this.calc();
-      },
-      'itemData.discount': function () {
-        this.calc();
-      },
-      'maliyatCheck': function (item) {
-        if (item === false) {
-          this.maliyatPercent = 0;
-        }
-        else {
-          this.maliyatPercent = this.bid.maliyatafzode;
-        }
-      },
-      'maliyatPercent': function (newVal) {
-        if (this.maliyatPercent == '') {
-          this.maliyatPercent = 0;
+      if (this.isNewInvoice) {
+        const draft = localStorage.getItem('sellInvoiceDraft');
+        if (draft) {
+          try {
+            const parsedDraft = JSON.parse(draft);
+            // بررسی اینکه آیا پیش‌نویس شامل داده‌های معتبر است
+            const hasValidData = parsedDraft.items && 
+                               parsedDraft.items.length > 0 && 
+                               parsedDraft.items.some(item => item.name || item.count > 0 || item.price > 0);
+            
+            if (hasValidData) {
+              this.showDraftDialog = true;
+            } else {
+              // اگر پیش‌نویس خالی است، آن را حذف می‌کنیم
+              localStorage.removeItem('sellInvoiceDraft');
+              this.addItem();
+            }
+          } catch (error) {
+            // اگر پیش‌نویس معتبر نیست، آن را حذف می‌کنیم
+            localStorage.removeItem('sellInvoiceDraft');
+            this.addItem();
+          }
+        } else {
+          this.addItem();
         }
+      } else {
+        await this.loadInvoice(this.$route.params.id);
+      }
+      
+      // در نهایت پرینترها را لود می‌کنیم
+      await this.loadPrinters();
+
+      // اضافه کردن event listener برای تشخیص خروج از صفحه
+      window.addEventListener('beforeunload', this.handleBeforeUnload);
+
+      // غیرفعال کردن حالت اولیه
+      this.$nextTick(() => {
+        this.isInitializing = false;
+      });
+    } catch (error) {
+      console.error('خطا در بارگذاری اولیه:', error);
+      this.error = 'خطا در بارگذاری اطلاعات';
+      this.showError = true;
+    }
+  },
+  beforeUnmount() {
+    // حذف event listener هنگام خروج از کامپوننت
+    window.removeEventListener('beforeunload', this.handleBeforeUnload);
+  },
+  methods: {
+    validateForm() {
+      this.validationErrors = [];
+      this.showValidationErrors = false;
+
+      if (!this.customer) {
+        this.validationErrors.push('لطفا خریدار را انتخاب کنید');
+      }
+
+      if (!this.invoiceDate) {
+        this.validationErrors.push('لطفا تاریخ را انتخاب کنید');
+      }
+
+      if (this.items.length === 0) {
+        this.validationErrors.push('لطفا حداقل یک کالا اضافه کنید');
+      } else {
         this.items.forEach((item, index) => {
-          item.sumWithoutTax = (item.price * item.count) - item.discount;
-          item.tax = (((item.price * item.count) - item.discount) * (newVal)) / 100;
-          item.sumTotal = (((parseFloat(item.price) * parseFloat(item.count)) - parseFloat(item.discount)) * (100 + parseFloat(this.maliyatPercent))) / 100;
-        })
-      },
-      'itemData.count': function () {
-        this.calc();
-      },
-      'itemData.commodity': function (newVal, oldVal) {
-        if (newVal != '' && newVal != undefined) {
-          //fetch price
-          if (this.selectedPriceList.id == 0) {
-            this.itemData.price = this.itemData.commodity.priceSell;
+          if (!item.name) {
+            this.validationErrors.push(`لطفا کالای ردیف ${index + 1} را انتخاب کنید`);
           }
-          else {
-            const arr = Array.from(this.itemData.commodity.prices);
-            arr.forEach((item) => {
-              if (item.list.id == this.selectedPriceList.id) {
-                this.itemData.price = item.priceSell;
-              }
-            });
+          if (!item.count || item.count <= 0) {
+            this.validationErrors.push(`لطفا تعداد کالای ردیف ${index + 1} را وارد کنید`);
           }
-          this.unitConfig.precision = this.itemData.commodity.unitData.floatNumber;
-          this.itemData.des = this.itemData.commodity.des;
-        }
-      },
-      itemsSelected: {
-        handler: function (val, oldVal) {
-          this.sumSelected = 0;
-          this.itemsSelected.forEach((item) => {
-            this.sumSelected += parseFloat(item.sumTotal);
-          })
-        },
-        deep: true
-      },
-      selectedPriceList: {
-        handler: function (val, oldVal) {
-          if (this.selectedPriceList.id == 0) {
-            this.itemData.price = this.itemData.commodity.priceSell;
+          if (!item.price || item.price <= 0) {
+            this.validationErrors.push(`لطفا قیمت کالای ردیف ${index + 1} را وارد کنید`);
           }
-          else {
-            const arr = Array.from(this.itemData.commodity.prices);
-            arr.forEach((item) => {
-              if (item.list.id == this.selectedPriceList.id) {
-                this.itemData.price = item.priceSell;
-              }
-            });
-          }
-        },
-        deep: true
-      },
-      items: {
-        handler: function (val, oldVal) {
-          this.calcInvoice();
-        },
-        deep: true
-      },
-      'data.transferCost': {
-        handler: function (val, oldVal) {
-          this.calcInvoice();
-        },
-        deep: false
-      },
-      'data.pair_docs': {
-        handler: function (val, oldVal) {
-          this.pair_docs = [];
-          this.data.pair_docs.forEach((pair) => {
-            this.buyDocs.forEach((buy) => {
-              if (pair == buy.code) {
-                this.pair_docs.push(buy);
-              }
-            })
-          })
-        },
-        deep: false
-      },
-      'data.discountAll': {
-        handler: function (val, oldVal) {
-          this.calcInvoice();
-        },
-        deep: false
-      },
-      'data.person': {
-        handler: function (val, oldVal) {
-          axios.post('/api/person/info/' + this.data.person.code).then((response) => {
-            this.selectedPersonWithDet = response.data;
-          });
-        },
-        deep: true
-      },
-    },
-    mounted() {
+        });
+      }
 
-    },
-    beforeMount() {
-      this.loadData();
-    },
-    beforeRouteUpdate(to, from) {
-      this.loadData(to.params.id);
-    },
-    methods: {
-      test(ev) {
-        alert();
-      },
-      isPluginActive(plugName) {
-        return this.plugins[plugName] !== undefined;
-      },
-      searchPerson(query, loading) {
-        loading(true);
-        axios.post('/api/person/list/search', { search: query }).then((response) => {
-          this.persons = response.data;
-          loading(false);
-        });
-      },
-      searchCommodity(query, loading) {
-        loading(true);
-        axios.post('/api/commodity/list/search', { search: query }).then((response) => {
-          this.commodity = response.data;
-          loading(false);
-        });
-      },
-      editItem(index) {
-        this.editItemData = { ... this.items[index - 1] };
-        this.editItemData.index = index;
-      },
-      doEditeItem() {
-        if (this.editItemData.count == 0) {
-          Swal.fire({
-            text: 'تعداد صفر نامعتبر است.',
-            icon: 'error',
-            confirmButtonText: 'قبول'
-          });
-        }
-        else if (this.editItemData.price == 0) {
-          Swal.fire({
-            text: 'قیمت صفر نامعتبر است.',
-            icon: 'error',
-            confirmButtonText: 'قبول'
-          });
-        }
-        else if (this.editItemData.commodity == '' || this.editItemData.commodity == undefined) {
-          Swal.fire({
-            text: 'کالایی انتخاب نشده است.',
-            icon: 'error',
-            confirmButtonText: 'قبول'
-          });
-        }
-        else if (this.editItemData.sumTotal == 0) {
-          Swal.fire({
-            text: 'جمع کل صفر شده است.',
-            icon: 'error',
-            confirmButtonText: 'قبول'
-          });
-        }
-        else {
-          this.items[this.editItemData.index - 1] = this.editItemData;
-          Swal.fire({
-            text: 'آیتم فاکتور ویرایش شد.',
-            icon: 'success',
-            confirmButtonText: 'قبول'
-          });
-        }
-      },
-      calc() {
-        this.itemData.sumWithoutTax = (this.itemData.price * this.itemData.count) - this.itemData.discount;
-        if (this.itemData.commodity.withoutTax) {
-          this.itemData.tax = 0;
-          this.itemData.sumTotal = (parseFloat(this.itemData.price) * parseFloat(this.itemData.count)) - parseFloat(this.itemData.discount);
-        }
-        else {
-          this.itemData.tax = (((this.itemData.price * this.itemData.count) - this.itemData.discount) * (this.maliyatPercent)) / 100;
-          this.itemData.sumTotal = (((parseFloat(this.itemData.price) * parseFloat(this.itemData.count)) - parseFloat(this.itemData.discount)) * (100 + parseFloat(this.maliyatPercent))) / 100;
-        }
-      },
-      editCalc() {
-        this.editItemData.sumWithoutTax = (this.editItemData.price * this.editItemData.count) - this.editItemData.discount;
-        if (this.editItemData.commodity.withoutTax) {
-          this.editItemData.tax = 0;
-          this.editItemData.sumTotal = (parseFloat(this.editItemData.price) * parseFloat(this.editItemData.count)) - parseFloat(this.editItemData.discount);
-        }
-        else {
-          this.editItemData.tax = (((this.editItemData.price * this.editItemData.count) - this.editItemData.discount) * (this.maliyatPercent)) / 100;
-          this.editItemData.sumTotal = (((parseFloat(this.editItemData.price) * parseFloat(this.editItemData.count)) - parseFloat(this.editItemData.discount)) * (100 + parseFloat(this.maliyatPercent))) / 100;
-        }
-      },
-      calcInvoice() {
-        this.sumTotal = 0;
-        this.sumTax = 0;
-        this.items.forEach((item) => {
-          this.sumTotal += parseFloat(item.sumTotal);
-          if (item.commodity.withoutTax == true) {
-            item.tax = 0;
-          }
-          else {
-            this.sumTax += parseFloat(item.tax);
-          }
-        });
-        this.sumTotal += this.data.transferCost;
-        this.sumTotal -= this.data.discountAll;
-      },
-      addItem() {
-        if (this.itemData.count == 0) {
-          Swal.fire({
-            text: 'تعداد صفر نامعتبر است.',
-            icon: 'error',
-            confirmButtonText: 'قبول'
-          });
-        }
-        else if (this.itemData.price == 0) {
-          Swal.fire({
-            text: 'قیمت صفر نامعتبر است.',
-            icon: 'error',
-            confirmButtonText: 'قبول'
-          });
-        }
-        else if (this.itemData.commodity == '' || this.itemData.commodity == undefined) {
-          Swal.fire({
-            text: 'کالایی انتخاب نشده است.',
-            icon: 'error',
-            confirmButtonText: 'قبول'
-          });
-        }
-        else if (this.itemData.sumTotal == 0) {
-          Swal.fire({
-            text: 'جمع کل صفر شده است.',
-            icon: 'error',
-            confirmButtonText: 'قبول'
-          });
-        }
-        else {
-          this.items.push(this.itemData);
-          this.itemData = {
-            id: 0,
-            commodity: this.commodity[0],
-            count: 0,
-            price: 0,
-            sumTotal: 0,
-            sumWithoutTax: 0,
-            tax: 0,
-            des: '',
-            discount: 0,
-          }
-          Swal.fire({
-            text: 'آیتم به فاکتور افزوده شد.',
-            icon: 'success',
-            confirmButtonText: 'قبول'
-          });
-        }
+      if (this.validationErrors.length > 0) {
+        this.showValidationErrors = true;
+      }
 
-      },
-      deleteItem(index) {
-        Swal.fire({
-          text: 'آیا برای حذف این مورد مطمئن هستید؟',
-          showCancelButton: true,
-          confirmButtonText: 'بله',
-          cancelButtonText: `خیر`,
-        }).then((result) => {
-          /* Read more about isConfirmed, isDenied below */
-          if (result.isConfirmed) {
-            this.items.splice(index - 1, 1);
-          }
-        })
-      },
-      loadData() {
+      return this.validationErrors.length === 0;
+    },
+    async loadInvoice(id) {
+      try {
         this.loading = true;
-        axios.post('/api/commodity/pricelist/list')
-          .then((response) => {
-            this.priceList = response.data;
-            this.priceList.push({
-              id: 0,
-              label: 'پیشفرض'
-            });
-          });
-        //load year
-        axios.post('/api/year/get').then((response) => {
-          this.year = response.data;
-          this.data.date = response.data.now;
-        })
-        //load business info
-        axios.post('/api/business/get/info/' + localStorage.getItem('activeBid')).then((response) => {
-          this.bid = response.data;
-          if (this.bid.maliyatafzode == 0) {
-            this.maliyatCheck = false;
-          }
-          this.maliyatPercent = this.bid.maliyatafzode;
-          this.loading = false;
-        })
-        //load persons
-        axios.post('/api/person/list/search').then((response) => {
-          this.persons = response.data;
-        });
-        //load commodities
-        axios.post('/api/commodity/list/search').then((response) => {
-          this.commodity = response.data;
-          if (response.data.length != 0) {
-            this.itemData.commodity = response.data[0];
-          }
-          else {
-            Swal.fire({
-              text: 'برای ثبت فاکتور ابتدا یک کالای جدید تعریف کنید.',
-              icon: 'warning',
-              confirmButtonText: 'تعریف کالای جدید'
-            })
-          }
-        });
-        //load commodity units
-        axios.post('/api/commodity/units').then((response) => {
-          this.units = response.data;
-        });
+        const response = await axios.get(`/api/sell/v2/get/${id}`);
+        
+        if (response.data.result !== 1) {
+          throw new Error(response.data.message || 'خطا در بارگذاری فاکتور');
+        }
 
-        //get active plugins
-        axios.post('/api/plugin/get/actives',).then((response) => {
-          this.plugins = response.data;
-        });
+        const data = response.data.data;
 
-        //load sms settings
-        axios.post('/api/sms/load/settings')
-          .then((response) => {
-            this.sms = response.data.sendAfterSell;
-          });
+        this.invoiceDate = data.date;
+        this.customer = data.person.id;
+        this.invoiceDescription = data.des;
+        this.taxPercent = data.taxPercent;
+        this.totalDiscount = Number(data.totalDiscount);
+        this.totalDiscountPercent = Number(data.discountPercent);
+        this.showTotalPercentDiscount = data.discountType === 'percent';
+        this.shippingCost = Number(data.shippingCost);
+        this.totalInvoice = Number(data.totalInvoice);
+        this.finalTotal = Number(data.finalTotal);
 
-        //load buy docs for pair docs
-        axios.post('/api/buy/docs/search', {
-          type: 'buy'
-        })
-          .then((response) => {
-            this.buyDocs = response.data;
-            //load data for edit document
-            if (this.$route.params.id != '') {
-              axios.post('/api/sell/get/info/' + this.$route.params.id).then((response) => {
-                this.data.date = response.data.date;
-                this.data.des = response.data.des;
-                this.data.person = response.data.person;
-                this.data.transferCost = response.data.transferCost
-                this.data.discountAll = response.data.discountAll
-                this.data.pair_docs = response.data.pair_docs
+        this.items = data.items.map(item => ({
+          name: {
+            id: item.name.id,
+            name: item.name.name,
+            code: item.name.code
+          },
+          count: Number(item.count),
+          price: Number(item.price),
+          discountPercent: Number(item.discountPercent),
+          discountAmount: Number(item.discountAmount),
+          total: Number(item.total),
+          description: item.description,
+          showPercentDiscount: item.showPercentDiscount,
+          tax: Number(item.tax)
+        }));
 
-                response.data.rows.forEach((item, key) => {
-                  if (item.commodity != null) {
-                    this.items.push({
-                      commodity: item.commodity,
-                      count: item.commodity_count,
-                      price: parseFloat((parseFloat(item.bs) - parseFloat(item.tax) + parseFloat(item.discount)) / parseFloat(item.commodity_count)),
-                      bs: item.bs,
-                      bd: item.bd,
-                      type: 'commodity',
-                      id: item.commodity.id,
-                      des: item.des,
-                      discount: item.discount,
-                      tax: item.tax,
-                      sumWithoutTax: parseFloat(item.bs) - parseFloat(item.tax),
-                      sumTotal: item.bs,
-                      table: 53
-                    });
-                  }
-                });
+        // بارگذاری اسناد پرداخت
+        this.paymentItems = data.payments.map(payment => ({
+          type: payment.type,
+          amount: Number(payment.amount),
+          reference: payment.reference,
+          description: payment.description,
+          bank: payment.bank,
+          cashdesk: payment.cashdesk,
+          salary: payment.salary
+        }));
+
+        this.recalculateTotals();
+        this.calculatePayments();
+      } catch (error) {
+        this.error = error.response?.data?.message || error.message || 'خطا در بارگذاری فاکتور';
+        this.showError = true;
+        console.error(error);
+      } finally {
+        this.loading = false;
+      }
+    },
+    async saveInvoice() {
+      if (!this.validateForm()) {
+        return;
+      }
+
+      try {
+        this.loading = true;
+        const data = {
+          id: this.$route.params.id || '',
+          invoiceDate: this.invoiceDate,
+          customer: this.customer,
+          invoiceDescription: this.invoiceDescription,
+          totalInvoice: this.totalInvoice,
+          taxPercent: this.taxPercent,
+          discountType: this.showTotalPercentDiscount ? 'percent' : 'fixed',
+          discountPercent: this.showTotalPercentDiscount ? this.totalDiscountPercent : null,
+          totalDiscount: this.showTotalPercentDiscount ? 0 : this.totalDiscount,
+          shippingCost: this.shippingCost,
+          showTotalPercentDiscount: this.showTotalPercentDiscount,
+          items: this.items.map(item => ({
+            name: { id: item.name.id },
+            count: item.count,
+            price: item.price,
+            discountType: item.showPercentDiscount ? 'percent' : 'fixed',
+            discountPercent: item.showPercentDiscount ? item.discountPercent : null,
+            discountAmount: item.showPercentDiscount ? 0 : item.discountAmount,
+            description: item.description,
+            showPercentDiscount: item.showPercentDiscount,
+            total: item.total,
+            tax: item.tax || 0
+          })),
+          sendSmsToCustomer: this.sendSmsToCustomer,
+          payments: this.paymentItems.map(payment => ({
+            type: payment.type,
+            amount: payment.amount,
+            reference: payment.reference,
+            description: payment.description,
+            bank: payment.bank,
+            cashdesk: payment.cashdesk,
+            salary: payment.salary
+          }))
+        };
+
+        const response = await axios.post('/api/sell/v2/mod', data);
+        
+        if (response.data.result === 1) {
+          // حذف پیش‌نویس پس از ذخیره موفق
+          localStorage.removeItem('sellInvoiceDraft');
+          this.hasChanges = false;
+          
+          this.successMessage = this.$route.params.id ? 'فاکتور با موفقیت ویرایش شد' : 'فاکتور با موفقیت ثبت شد';
+          this.showSuccess = true;
+
+          // اگر گزینه خروجی PDF فعال باشد
+          if (this.generatePdf) {
+            try {
+              const printResponse = await axios.post('/api/sell/print/invoice', {
+                code: response.data.data.code,
+                pdf: true,
+                printers: this.cloudPrint,
               });
+              
+              if (printResponse.data && printResponse.data.id) {
+                // باز کردن PDF در پنجره جدید
+                window.open(this.$API_URL + '/front/print/' + printResponse.data.id, '_blank', 'noreferrer');
+              } else {
+                throw new Error('خطا در دریافت شناسه چاپ');
+              }
+            } catch (printError) {
+              console.error('خطا در چاپ فاکتور:', printError);
+              this.error = 'خطا در ایجاد نسخه PDF';
+              this.showError = true;
             }
-            this.loading = false;
-          })
-      },
-      save() {
-        this.canSubmit = false;
-        if (this.items.length == 0) {
-          Swal.fire({
-            text: 'فاکتور فاقد کالا می باشد.',
-            icon: 'warning',
-            confirmButtonText: 'قبول'
+          }
+
+          setTimeout(() => {
+            this.$router.push('/acc/sell/list');
+          }, 1500);
+        } else {
+          this.error = response.data.message || 'خطا در ذخیره فاکتور';
+          this.showError = true;
+        }
+      } catch (error) {
+        this.error = error.response?.data?.message || 'خطا در ذخیره فاکتور';
+        this.showError = true;
+        console.error(error);
+      } finally {
+        this.loading = false;
+      }
+    },
+    async deleteInvoice() {
+      this.deleteDialog = true;
+    },
+    async confirmDelete() {
+      try {
+        this.loading = true;
+        await axios.delete(`/api/invoice/delete/${this.$route.params.id}`);
+        this.$router.push('/acc/sell/list');
+      } catch (error) {
+        this.error = 'خطا در حذف فاکتور';
+        console.error(error);
+      } finally {
+        this.loading = false;
+        this.deleteDialog = false;
+      }
+    },
+    addItem() {
+      this.items.push({
+        name: null,
+        count: 0,
+        price: 0,
+        discountPercent: 0,
+        discountAmount: 0,
+        total: 0,
+        description: '',
+        showPercentDiscount: this.showPercentDiscount
+      });
+      this.recalculateTotals();
+    },
+    removeItem(index) {
+      this.items.splice(index, 1);
+      this.recalculateTotals();
+    },
+    recalculateTotals() {
+      let total = 0;
+      this.items.forEach(item => {
+        const basePrice = (item.count || 0) * (item.price || 0);
+        let totalDiscount = 0;
+
+        if (item.showPercentDiscount) {
+          totalDiscount = Math.round((basePrice * (item.discountPercent || 0)) / 100);
+        } else {
+          totalDiscount = item.discountAmount || 0;
+        }
+
+        if (totalDiscount > basePrice) {
+          item.discountPercent = 0;
+          item.discountAmount = 0;
+          this.showError = true;
+        }
+
+        const itemTotal = basePrice - totalDiscount;
+        item.total = itemTotal;
+        total += itemTotal;
+      });
+      this.totalInvoice = total;
+
+      // محاسبه مالیات برای هر آیتم
+      this.items.forEach(item => {
+        item.tax = Math.round((item.total * this.taxPercent) / 100);
+      });
+
+      // محاسبه کل مالیات
+      this.taxAmount = this.items.reduce((sum, item) => sum + (item.tax || 0), 0);
+      this.totalWithoutTax = total;
+
+      let calculatedTotalDiscount = 0;
+      if (this.showTotalPercentDiscount) {
+        calculatedTotalDiscount = Math.round((total * this.totalDiscountPercent) / 100);
+      } else {
+        calculatedTotalDiscount = this.totalDiscount;
+      }
+
+      if (calculatedTotalDiscount > total) {
+        this.totalDiscountPercent = 0;
+        this.totalDiscount = 0;
+        this.showDiscountError = true;
+      }
+
+      this.finalTotal = total + this.taxAmount - calculatedTotalDiscount + this.shippingCost;
+      this.totalAmount = this.finalTotal;
+      this.calculatePayments();
+    },
+    handleDiscountTypeChange(item) {
+      if (item.showPercentDiscount) {
+        item.discountAmount = 0;
+      } else {
+        item.discountPercent = 0;
+      }
+      this.recalculateTotals();
+    },
+    calculatePayments() {
+      const total = this.paymentItems.reduce((sum, item) => {
+        const amount = item.amount !== null && item.amount !== undefined ? Number(item.amount) : 0;
+        return sum + amount;
+      }, 0);
+
+      this.totalPayments = total;
+      this.remainingAmount = this.totalAmount - total;
+    },
+    fillWithTotal(item) {
+      const total = this.paymentItems.reduce((sum, i) => {
+        if (i !== item) {
+          const amount = i.amount !== null && i.amount !== undefined ? Number(i.amount) : 0;
+          return sum + amount;
+        }
+        return sum;
+      }, 0);
+
+      item.amount = this.totalAmount - total;
+      this.calculatePayments();
+    },
+    deletePaymentItem(index) {
+      this.paymentItems.splice(index, 1);
+      this.calculatePayments();
+    },
+    addPaymentItem(type) {
+      let item = {
+        type,
+        amount: 0,
+        reference: '',
+        description: '',
+        bank: null,
+        cashdesk: null,
+        salary: null
+      };
+
+      this.paymentItems.push(item);
+      this.showPaymentMenu = false;
+      this.calculatePayments();
+    },
+    async loadPrinters() {
+      try {
+        const response = await axios.get('/api/printers/list');
+        this.printers = response.data || [];
+      } catch (error) {
+        console.error('خطا در دریافت لیست پرینترها:', error);
+      }
+    },
+    saveDraft() {
+      if (!this.isNewInvoice) return;
+      
+      // بررسی اینکه آیا داده‌های معتبری برای ذخیره وجود دارد
+      const hasValidData = this.items && 
+                          this.items.length > 0 && 
+                          this.items.some(item => item.name || item.count > 0 || item.price > 0);
+      
+      if (hasValidData) {
+        const draft = {
+          invoiceDate: this.invoiceDate,
+          customer: this.customer,
+          invoiceDescription: this.invoiceDescription,
+          taxPercent: this.taxPercent,
+          totalDiscount: this.totalDiscount,
+          totalDiscountPercent: this.totalDiscountPercent,
+          showTotalPercentDiscount: this.showTotalPercentDiscount,
+          shippingCost: this.shippingCost,
+          items: this.items,
+          paymentItems: this.paymentItems
+        };
+        
+        localStorage.setItem('sellInvoiceDraft', JSON.stringify(draft));
+      } else {
+        // اگر داده‌های معتبری وجود ندارد، پیش‌نویس را حذف می‌کنیم
+        localStorage.removeItem('sellInvoiceDraft');
+      }
+    },
+    loadDraft() {
+      try {
+        this.isInitializing = true;
+        const draft = JSON.parse(localStorage.getItem('sellInvoiceDraft'));
+        if (draft) {
+          // تنظیم مقادیر اصلی
+          this.invoiceDate = draft.invoiceDate;
+          this.customer = draft.customer;
+          this.invoiceDescription = draft.invoiceDescription;
+          this.taxPercent = draft.taxPercent;
+          this.totalDiscount = draft.totalDiscount;
+          this.totalDiscountPercent = draft.totalDiscountPercent;
+          this.showTotalPercentDiscount = draft.showTotalPercentDiscount;
+          this.shippingCost = draft.shippingCost;
+
+          // تنظیم آیتم‌های فاکتور
+          this.items = draft.items.map(item => ({
+            ...item,
+            name: item.name ? {
+              id: item.name.id,
+              name: item.name.name,
+              code: item.name.code,
+              priceSell: item.name.priceSell
+            } : null,
+            count: Number(item.count) || 0,
+            price: Number(item.price) || 0,
+            discountPercent: Number(item.discountPercent) || 0,
+            discountAmount: Number(item.discountAmount) || 0,
+            total: Number(item.total) || 0,
+            description: item.description || '',
+            showPercentDiscount: item.showPercentDiscount || false
+          }));
+
+          // تنظیم آیتم‌های پرداخت
+          this.paymentItems = draft.paymentItems.map(payment => ({
+            type: payment.type,
+            amount: Number(payment.amount) || 0,
+            reference: payment.reference || '',
+            description: payment.description || '',
+            bank: payment.bank || null,
+            cashdesk: payment.cashdesk || null,
+            salary: payment.salary || null
+          }));
+
+          // محاسبه مجدد مبالغ
+          this.$nextTick(() => {
+            this.recalculateTotals();
+            this.calculatePayments();
+            this.isInitializing = false;
           });
         }
-        else if (this.data.person == null || this.data.person == '') {
-          Swal.fire({
-            text: 'طرف حساب انتخاب نشده است.',
-            icon: 'warning',
-            confirmButtonText: 'قبول'
-          });
-        }
-        else {
-          this.loading = true;
-          axios.post('/api/sell/mod', {
-            type: 'sell',
-            date: this.data.date,
-            des: this.data.des,
-            person: this.data.person,
-            rows: this.items,
-            discountAll: this.data.discountAll,
-            transferCost: this.data.transferCost,
-            update: this.$route.params.id,
-            sms: this.sms,
-            pair_docs: this.data.pair_docs
-          }).then((response) => {
-            this.loading = false;
-            if (response.data.code == 0) {
-              Swal.fire({
-                text: 'فاکتور ثبت شد.',
-                icon: 'success',
-                confirmButtonText: 'قبول'
-              }).then(() => {
-                this.$router.push('/acc/sell/list')
-              });
-            }
-            else if (response.data.result == 1) {
-              Swal.fire({
-                text: 'فاکتور ثبت و پیامک اطلاع رسانی به مشتری ارسال شد.',
-                icon: 'success',
-                confirmButtonText: 'قبول'
-              }).then(() => {
-                this.$router.push('/acc/sell/list')
-              });
-            }
-            else if (response.data.result == 2) {
-              Swal.fire({
-                text: 'فاکتور ثبت ولی به دلیل کمبود اعتبار پیامک اطلاع رسانی به مشتری ارسال نشد..',
-                icon: 'success',
-                confirmButtonText: 'قبول'
-              }).then(() => {
-                this.$router.push('/acc/sell/list')
-              });
-            }
-            else {
-              Swal.fire({
-                text: response.data.message,
-                icon: 'error',
-                confirmButtonText: 'قبول'
-              })
-            }
-
-          }).catch((response) => {
-            this.loading = false;
-            Swal.fire({
-              text: 'اتصال با سرویس دهنده برقرار نشد. لطفا اتصال اینترنت خود را بررسی نمایید.',
-              icon: 'error',
-              confirmButtonText: 'قبول'
-            });
-          });
-        }
-        this.canSubmit = true;
+      } catch (error) {
+        console.error('خطا در بارگذاری پیش‌نویس:', error);
+        this.error = 'خطا در بارگذاری پیش‌نویس';
+        this.showError = true;
+        this.isInitializing = false;
+      }
+      this.showDraftDialog = false;
+    },
+    discardDraft() {
+      localStorage.removeItem('sellInvoiceDraft');
+      this.showDraftDialog = false;
+      this.addItem();
+    },
+    handleBeforeUnload(event) {
+      if (this.isNewInvoice && this.hasChanges) {
+        event.preventDefault();
+        event.returnValue = '';
       }
     }
   }
+}
 </script>
 
-  <style scoped>
-  #vs5__listbox {
-    z-index: 999999;
-  }
+<style scoped>
+.bank-card {
+  border-right: 4px solid #1976D2 !important;
+}
+
+.cashdesk-card {
+  border-right: 4px solid #4CAF50 !important;
+}
+
+.salary-card {
+  border-right: 4px solid #FF9800 !important;
+}
+
+.tabs-container {
+  background-color: #f5f5f5;
+}
+
+.payment-card :deep(.v-card-item) {
+  min-height: 40px;
+}
+
+.payment-card :deep(.v-card-title) {
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+}
+
+.payment-card :deep(.v-card-text) {
+  padding-top: 8px;
+  padding-bottom: 8px;
+}
+
+:deep(.v-overlay__content) {
+  z-index: 9999 !important;
+}
+
+:deep(.v-menu__content) {
+  z-index: 9999 !important;
+}
+
+:deep(.v-dialog) {
+  z-index: 9999 !important;
+}
+
+:deep(.v-date-picker) {
+  z-index: 9999 !important;
+}
+
+.settings-section-card {
+  height: 100%;
+  transition: all 0.3s ease;
+}
+
+.settings-section-card:hover {
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+}
+
+.settings-section-title {
+  background-color: #f5f5f5;
+  padding: 16px;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.settings-section-content {
+  padding: 20px;
+}
+
+.settings-section-card :deep(.v-switch) {
+  margin-bottom: 8px;
+}
+
+.settings-section-card :deep(.v-switch .v-label) {
+  font-size: 0.9rem;
+  color: #424242;
+}
+
+.settings-section-card :deep(.v-switch.v-input--disabled) {
+  opacity: 0.6;
+}
+
+.settings-section-card :deep(.v-select) {
+  margin-top: 8px;
+}
+
+.settings-section-card :deep(.v-divider) {
+  margin: 16px 0;
+}
+
+.draft-dialog {
+  border-radius: 12px;
+  overflow: hidden;
+}
+
+.draft-dialog-title {
+  background-color: #f5f5f5;
+  padding: 16px;
+  font-size: 1.25rem;
+  font-weight: 500;
+  display: flex;
+  align-items: center;
+}
+
+.draft-dialog-content {
+  padding: 24px;
+}
+
+.draft-message {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  padding: 16px 0;
+}
+
+.draft-message p {
+  margin: 8px 0;
+}
+
+.draft-dialog-actions {
+  padding: 16px;
+  background-color: #f5f5f5;
+}
+
+:deep(.v-btn) {
+  text-transform: none;
+  letter-spacing: 0;
+  font-weight: 500;
+}
+
+:deep(.v-btn--elevated) {
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
+
+:deep(.v-btn--outlined) {
+  border-width: 1px;
+}
 </style>
\ No newline at end of file
diff --git a/webUI/src/views/acc/sell/viewInvoice.vue b/webUI/src/views/acc/sell/viewInvoice.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/settings/avatar.vue b/webUI/src/views/acc/settings/avatar.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/settings/bussiness.vue b/webUI/src/views/acc/settings/bussiness.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/settings/extramoneys.vue b/webUI/src/views/acc/settings/extramoneys.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/settings/logs.vue b/webUI/src/views/acc/settings/logs.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/settings/print.vue b/webUI/src/views/acc/settings/print.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/settings/user_perm_edit.vue b/webUI/src/views/acc/settings/user_perm_edit.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/settings/user_rolls.vue b/webUI/src/views/acc/settings/user_rolls.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/shareholder/list.vue b/webUI/src/views/acc/shareholder/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/smspanel/smspanel.vue b/webUI/src/views/acc/smspanel/smspanel.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/store/plugin-invoice.vue b/webUI/src/views/acc/store/plugin-invoice.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/store/plugin-my.vue b/webUI/src/views/acc/store/plugin-my.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/store/plugin-world.vue b/webUI/src/views/acc/store/plugin-world.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/store/viewProdect.vue b/webUI/src/views/acc/store/viewProdect.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/storeroom/commodityCheck/checkByStoreroom.vue b/webUI/src/views/acc/storeroom/commodityCheck/checkByStoreroom.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/storeroom/io/buy.vue b/webUI/src/views/acc/storeroom/io/buy.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/storeroom/io/modalNew.vue b/webUI/src/views/acc/storeroom/io/modalNew.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/storeroom/io/rfbuy.vue b/webUI/src/views/acc/storeroom/io/rfbuy.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/storeroom/io/rfsell.vue b/webUI/src/views/acc/storeroom/io/rfsell.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/storeroom/io/sell.vue b/webUI/src/views/acc/storeroom/io/sell.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/storeroom/io/ticketList.vue b/webUI/src/views/acc/storeroom/io/ticketList.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/storeroom/io/view.vue b/webUI/src/views/acc/storeroom/io/view.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/storeroom/list.vue b/webUI/src/views/acc/storeroom/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/storeroom/mod.vue b/webUI/src/views/acc/storeroom/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/transfer/list.vue b/webUI/src/views/acc/transfer/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/transfer/mod.vue b/webUI/src/views/acc/transfer/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/ultimatepackage/list.vue b/webUI/src/views/acc/ultimatepackage/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/ultimatepackage/new.vue b/webUI/src/views/acc/ultimatepackage/new.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/acc/wallet/view.vue b/webUI/src/views/acc/wallet/view.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/App.vue b/webUI/src/views/user/App.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/InstallPWA.vue b/webUI/src/views/user/InstallPWA.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/ReferralRedirect.vue b/webUI/src/views/user/ReferralRedirect.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/active-account.vue b/webUI/src/views/user/active-account.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/change-password.vue b/webUI/src/views/user/change-password.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/login.vue b/webUI/src/views/user/login.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/business/list.vue b/webUI/src/views/user/manager/business/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/log/logs.vue b/webUI/src/views/user/manager/log/logs.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/online-users.vue b/webUI/src/views/user/manager/online-users.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/reportchange/list.vue b/webUI/src/views/user/manager/reportchange/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/reportchange/mod.vue b/webUI/src/views/user/manager/reportchange/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/settings/database_info.vue b/webUI/src/views/user/manager/settings/database_info.vue
old mode 100755
new mode 100644
index fe99816..e5b0016
--- a/webUI/src/views/user/manager/settings/database_info.vue
+++ b/webUI/src/views/user/manager/settings/database_info.vue
@@ -7,33 +7,73 @@ export default defineComponent({
   name: "database_info",
   data: () => {
     return {
-      loading: ref(true),
+      loading: ref(false),
+      backupLoading: ref(false),
+      ftpLoading: ref(false),
+      lastBackup: null as string | null,
+      lastFtpBackup: null as string | null,
     }
   },
   methods: {
-    loadData() {
-      this.loading = false;
-    },
-    createDatabaseFile() {
+    async loadData() {
       this.loading = true;
-      axios.post('/api/admin/database/backup/create').then((resp) => {
+      try {
+        const response = await axios.get('/api/admin/database/backup/info');
+        this.lastBackup = response.data.lastBackup;
+        this.lastFtpBackup = response.data.lastFtpBackup;
+      } catch (error) {
+        console.error('Error loading backup info:', error);
+      } finally {
         this.loading = false;
-        if (resp.data.result == 0) {
-          Swal.fire({
-            text: 'فایل پشتیبان از بانک اطلاعاتی با نام ' + resp.data.filename + 'در پوشه Backup با موفقیت ایجاد شد.',
+      }
+    },
+    async createLocalBackup() {
+      this.backupLoading = true;
+      try {
+        const resp = await axios.post('/api/admin/database/backup/create');
+        if (resp.data.result === 1) {
+          await Swal.fire({
+            text: `فایل پشتیبان از بانک اطلاعاتی با نام ${resp.data.filename} در پوشه Backup با موفقیت ایجاد شد.`,
             icon: 'success',
             confirmButtonText: 'قبول',
           });
+          this.loadData(); // به‌روزرسانی اطلاعات
+        } else {
+          throw new Error(resp.data.message || 'خطا در ایجاد پشتیبان');
         }
-      }).catch((response)=>{
-        this.loading = false;
-        Swal.fire({
-            text: this.$t('dialog.error_operation'),
-            icon: 'error',
-            confirmButtonText: this.$t('dialog.ok'),
+      } catch (error: any) {
+        await Swal.fire({
+          text: error.response?.data?.message || this.$t('dialog.error_operation'),
+          icon: 'error',
+          confirmButtonText: this.$t('dialog.ok'),
+        });
+      } finally {
+        this.backupLoading = false;
+      }
+    },
+    async createAndUploadToFtp() {
+      this.ftpLoading = true;
+      try {
+        const resp = await axios.post('/api/admin/database/backup/create-and-upload');
+        if (resp.data.result === 1) {
+          await Swal.fire({
+            text: `فایل پشتیبان با نام ${resp.data.filename} ایجاد و با موفقیت به سرور FTP ارسال شد.`,
+            icon: 'success',
+            confirmButtonText: 'قبول',
           });
-      });
-
+          this.loadData(); // به‌روزرسانی اطلاعات
+        } else {
+          throw new Error(resp.data.message || 'خطا در ایجاد و ارسال پشتیبان');
+        }
+      } catch (error: any) {
+        await Swal.fire({
+          text: error.response?.data?.message || this.$t('dialog.error_operation'),
+          icon: 'error',
+          confirmButtonText: this.$t('dialog.ok'),
+        });
+      } finally {
+        this.ftpLoading = false;
+      }
     }
   },
   beforeMount() {
@@ -43,21 +83,69 @@ export default defineComponent({
 </script>
 
 <template>
-  <v-toolbar color="toolbar" :title="$t('pages.manager.database')">
-    <v-spacer></v-spacer>
-  </v-toolbar>
-  <v-container class="pa-0">
-    <v-card :loading="loading ? 'red' : null" :disabled="loading">
-      <v-card-text class="">
-        <v-row class="mb-2">
-          <v-col cols="12" sm="12" md="12">
+  <v-container fluid class="pa-0">
+    <v-toolbar color="toolbar">
+      <v-toolbar-title>{{ $t('pages.manager.database') }}</v-toolbar-title>
+      <v-spacer></v-spacer>
+    </v-toolbar>
+
+    <v-card :loading="loading ? 'red' : undefined" :disabled="loading">
+      <v-card-text>
+        <v-row>
+          <v-col cols="12">
             <v-alert :text="$t('pages.manager.database_info')" type="warning"></v-alert>
           </v-col>
-          <v-col cols="12" sm="12" md="12">
-            <v-btn type="submit" @click="createDatabaseFile()" color="primary" prepend-icon="mdi-database-export"
-              :loading="loading" :title="$t('dialog.database_export')">
-              {{ $t('dialog.database_export') }}
-            </v-btn>
+
+          <v-col cols="12" md="6">
+            <v-card variant="outlined" class="pa-4">
+              <v-card-title class="text-h6">
+                <v-icon start icon="mdi-database-export" class="me-2"></v-icon>
+                پشتیبان‌گیری محلی
+              </v-card-title>
+              <v-card-text>
+                <p class="text-body-2 mb-4">
+                  با استفاده از این گزینه می‌توانید یک نسخه پشتیبان از بانک اطلاعاتی در سرور ایجاد کنید.
+                </p>
+                <p v-if="lastBackup" class="text-caption">
+                  آخرین پشتیبان: {{ lastBackup }}
+                </p>
+                <v-btn
+                  color="primary"
+                  prepend-icon="mdi-database-export"
+                  :loading="backupLoading"
+                  @click="createLocalBackup"
+                  block
+                >
+                  ایجاد پشتیبان در سرور
+                </v-btn>
+              </v-card-text>
+            </v-card>
+          </v-col>
+
+          <v-col cols="12" md="6">
+            <v-card variant="outlined" class="pa-4">
+              <v-card-title class="text-h6">
+                <v-icon start icon="mdi-cloud-upload" class="me-2"></v-icon>
+                پشتیبان‌گیری و ارسال به FTP
+              </v-card-title>
+              <v-card-text>
+                <p class="text-body-2 mb-4">
+                  با استفاده از این گزینه می‌توانید یک نسخه پشتیبان ایجاد کرده و آن را به سرور FTP ارسال کنید.
+                </p>
+                <p v-if="lastFtpBackup" class="text-caption">
+                  آخرین پشتیبان FTP: {{ lastFtpBackup }}
+                </p>
+                <v-btn
+                  color="secondary"
+                  prepend-icon="mdi-cloud-upload"
+                  :loading="ftpLoading"
+                  @click="createAndUploadToFtp"
+                  block
+                >
+                  ایجاد و ارسال به FTP
+                </v-btn>
+              </v-card-text>
+            </v-card>
           </v-col>
         </v-row>
       </v-card-text>
@@ -65,4 +153,8 @@ export default defineComponent({
   </v-container>
 </template>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped>
+.v-card {
+  margin-bottom: 16px;
+}
+</style>
\ No newline at end of file
diff --git a/webUI/src/views/user/manager/settings/plugins.vue b/webUI/src/views/user/manager/settings/plugins.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/settings/registry.vue b/webUI/src/views/user/manager/settings/registry.vue
old mode 100755
new mode 100644
index 1ca64f0..a462896
--- a/webUI/src/views/user/manager/settings/registry.vue
+++ b/webUI/src/views/user/manager/settings/registry.vue
@@ -27,6 +27,12 @@ export default defineComponent({
       appUrl: '',
       appSlogan: '',
       verifyMobileViaSms: false,
+      ftpEnabled: false,
+      ftpHost: '',
+      ftpPort: '21',
+      ftpUsername: '',
+      ftpPassword: '',
+      ftpPath: '',
     },
     dialogVisible: false,
     dialogMessage: '',
@@ -118,6 +124,38 @@ export default defineComponent({
           return false;
         }
       }
+
+      // اعتبارسنجی تنظیمات FTP
+      if (this.settings.ftpEnabled) {
+        const ftpChecks = [
+          { value: this.settings.ftpHost, message: 'آدرس سرور FTP الزامی است' },
+          { value: this.settings.ftpPort, message: 'پورت FTP الزامی است' },
+          { value: this.settings.ftpUsername, message: 'نام کاربری FTP الزامی است' },
+          { value: this.settings.ftpPassword, message: 'رمز عبور FTP الزامی است' },
+          { value: this.settings.ftpPath, message: 'مسیر ذخیره‌سازی FTP الزامی است' }
+        ];
+
+        const ftpError = ftpChecks.find(check => !check.value);
+        if (ftpError) {
+          this.showErrorDialog(ftpError.message);
+          return false;
+        }
+
+        // اعتبارسنجی پورت
+        const port = parseInt(this.settings.ftpPort);
+        if (isNaN(port) || port < 1 || port > 65535) {
+          this.showErrorDialog('پورت FTP باید عددی بین 1 تا 65535 باشد');
+          return false;
+        }
+
+        // اعتبارسنجی آدرس سرور
+        const hostRegex = /^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\.[a-zA-Z]{2,})+$/;
+        if (!hostRegex.test(this.settings.ftpHost)) {
+          this.showErrorDialog('آدرس سرور FTP نامعتبر است');
+          return false;
+        }
+      }
+
       return true;
     },
     async runTicketUpdate() {
@@ -161,6 +199,67 @@ export default defineComponent({
         this.settings.autoUpdateTicketsInterval = 1;
       }
     },
+    async testFtpConnection() {
+      if (!this.validateFtpFields()) {
+        return;
+      }
+
+      this.dialogVisible = true;
+      this.dialogLoading = true;
+      this.dialogMessage = 'در حال تست اتصال به سرور FTP...';
+
+      try {
+        const response = await axios.post('/api/admin/registry/settings/test-ftp', {
+          host: this.settings.ftpHost,
+          port: this.settings.ftpPort,
+          username: this.settings.ftpUsername,
+          password: this.settings.ftpPassword,
+          path: this.settings.ftpPath
+        });
+
+        this.dialogMessage = response.data.success 
+          ? 'اتصال به سرور FTP با موفقیت برقرار شد'
+          : 'خطا در اتصال به سرور FTP: ' + response.data.message;
+      } catch (error: any) {
+        this.dialogMessage = error.response?.data?.message || 'خطایی در تست اتصال رخ داد';
+      } finally {
+        this.dialogLoading = false;
+      }
+    },
+    validateFtpFields() {
+      if (!this.settings.ftpEnabled) {
+        this.showErrorDialog('لطفا ابتدا اتصال FTP را فعال کنید');
+        return false;
+      }
+
+      const ftpChecks = [
+        { value: this.settings.ftpHost, message: 'آدرس سرور FTP الزامی است' },
+        { value: this.settings.ftpPort, message: 'پورت FTP الزامی است' },
+        { value: this.settings.ftpUsername, message: 'نام کاربری FTP الزامی است' },
+        { value: this.settings.ftpPassword, message: 'رمز عبور FTP الزامی است' },
+        { value: this.settings.ftpPath, message: 'مسیر ذخیره‌سازی FTP الزامی است' }
+      ];
+
+      const ftpError = ftpChecks.find(check => !check.value);
+      if (ftpError) {
+        this.showErrorDialog(ftpError.message);
+        return false;
+      }
+
+      const port = parseInt(this.settings.ftpPort);
+      if (isNaN(port) || port < 1 || port > 65535) {
+        this.showErrorDialog('پورت FTP باید عددی بین 1 تا 65535 باشد');
+        return false;
+      }
+
+      const hostRegex = /^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\.[a-zA-Z]{2,})+$/;
+      if (!hostRegex.test(this.settings.ftpHost)) {
+        this.showErrorDialog('آدرس سرور FTP نامعتبر است');
+        return false;
+      }
+
+      return true;
+    },
   },
   watch: {
     'settings.canFreeAccounting'(newValue) {
@@ -190,6 +289,7 @@ export default defineComponent({
       <v-tab value="general">تنظیمات عمومی</v-tab>
       <v-tab value="pricing">قیمت‌گذاری</v-tab>
       <v-tab value="automation">اتوماسیون</v-tab>
+      <v-tab value="ftp">تنظیمات FTP</v-tab>
     </v-tabs>
 
     <v-card :loading="loading ? 'red' : undefined" :disabled="loading">
@@ -414,6 +514,103 @@ export default defineComponent({
             </v-row>
           </v-card-text>
         </v-window-item>
+
+        <v-window-item value="ftp">
+          <v-card-text>
+            <v-row>
+              <v-col cols="12">
+                <v-card variant="outlined" class="pa-4 mb-4">
+                  <v-row>
+                    <v-col cols="12" sm="4">
+                      <v-switch
+                        v-model="settings.ftpEnabled"
+                        label="فعال‌سازی اتصال FTP"
+                        color="primary"
+                        density="comfortable"
+                      ></v-switch>
+                    </v-col>
+                  </v-row>
+                  <v-row>
+                    <v-col cols="12" sm="6">
+                      <v-text-field
+                        v-model="settings.ftpHost"
+                        label="آدرس سرور FTP"
+                        :disabled="!settings.ftpEnabled"
+                        type="text"
+                        placeholder="ftp.example.com"
+                        density="comfortable"
+                        :rules="[
+                          v => !settings.ftpEnabled || !!v || 'آدرس سرور FTP الزامی است',
+                          v => !settings.ftpEnabled || /^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\.[a-zA-Z]{2,})+$/.test(v) || 'آدرس سرور FTP نامعتبر است'
+                        ]"
+                      ></v-text-field>
+                    </v-col>
+                    <v-col cols="12" sm="6">
+                      <v-text-field
+                        v-model="settings.ftpPort"
+                        label="پورت"
+                        :disabled="!settings.ftpEnabled"
+                        type="text"
+                        placeholder="21"
+                        density="comfortable"
+                        :rules="[
+                          v => !settings.ftpEnabled || !!v || 'پورت FTP الزامی است',
+                          v => !settings.ftpEnabled || (!isNaN(parseInt(v)) && parseInt(v) >= 1 && parseInt(v) <= 65535) || 'پورت FTP باید عددی بین 1 تا 65535 باشد'
+                        ]"
+                      ></v-text-field>
+                    </v-col>
+                    <v-col cols="12" sm="6">
+                      <v-text-field
+                        v-model="settings.ftpUsername"
+                        label="نام کاربری"
+                        :disabled="!settings.ftpEnabled"
+                        type="text"
+                        density="comfortable"
+                        :rules="[v => !settings.ftpEnabled || !!v || 'نام کاربری FTP الزامی است']"
+                      ></v-text-field>
+                    </v-col>
+                    <v-col cols="12" sm="6">
+                      <v-text-field
+                        v-model="settings.ftpPassword"
+                        label="رمز عبور"
+                        :disabled="!settings.ftpEnabled"
+                        type="password"
+                        density="comfortable"
+                        :rules="[v => !settings.ftpEnabled || !!v || 'رمز عبور FTP الزامی است']"
+                      ></v-text-field>
+                    </v-col>
+                    <v-col cols="12">
+                      <v-text-field
+                        v-model="settings.ftpPath"
+                        label="مسیر ذخیره‌سازی"
+                        :disabled="!settings.ftpEnabled"
+                        type="text"
+                        placeholder="/public_html/backup"
+                        density="comfortable"
+                        :rules="[
+                          v => !settings.ftpEnabled || !!v || 'مسیر ذخیره‌سازی FTP الزامی است',
+                          v => !settings.ftpEnabled || v.startsWith('/') || 'مسیر باید با / شروع شود'
+                        ]"
+                      ></v-text-field>
+                    </v-col>
+                    <v-col cols="12" class="text-center">
+                      <v-btn
+                        @click="testFtpConnection"
+                        color="secondary"
+                        prepend-icon="mdi-connection"
+                        :loading="dialogLoading"
+                        :disabled="!settings.ftpEnabled"
+                        class="mt-4"
+                      >
+                        تست اتصال
+                      </v-btn>
+                    </v-col>
+                  </v-row>
+                </v-card>
+              </v-col>
+            </v-row>
+          </v-card-text>
+        </v-window-item>
       </v-window>
     </v-card>
 
diff --git a/webUI/src/views/user/manager/settings/sms/smsSettings.vue b/webUI/src/views/user/manager/settings/sms/smsSettings.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/settings/system.vue b/webUI/src/views/user/manager/settings/system.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/settings/update-core.vue b/webUI/src/views/user/manager/settings/update-core.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/statements/list.vue b/webUI/src/views/user/manager/statements/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/statements/mod.vue b/webUI/src/views/user/manager/statements/mod.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/support/list.vue b/webUI/src/views/user/manager/support/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/support/show.vue b/webUI/src/views/user/manager/support/show.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/users/change-password.vue b/webUI/src/views/user/manager/users/change-password.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/users/list.vue b/webUI/src/views/user/manager/users/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/manager/wallet/list.vue b/webUI/src/views/user/manager/wallet/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/profile/add-mobile.vue b/webUI/src/views/user/profile/add-mobile.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/profile/business/insert.vue b/webUI/src/views/user/profile/business/insert.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/profile/business/list.vue b/webUI/src/views/user/profile/business/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/profile/dashboard.vue b/webUI/src/views/user/profile/dashboard.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/profile/forget-password-submit-code.vue b/webUI/src/views/user/profile/forget-password-submit-code.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/profile/forget-password.vue b/webUI/src/views/user/profile/forget-password.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/profile/profile-main.vue b/webUI/src/views/user/profile/profile-main.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/profile/support/list.vue b/webUI/src/views/user/profile/support/list.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/profile/support/new.vue b/webUI/src/views/user/profile/support/new.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/profile/support/show.vue b/webUI/src/views/user/profile/support/show.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/register.vue b/webUI/src/views/user/register.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/user/single.vue b/webUI/src/views/user/single.vue
old mode 100755
new mode 100644
diff --git a/webUI/src/views/wizard/home.vue b/webUI/src/views/wizard/home.vue
old mode 100755
new mode 100644
diff --git a/webUI/tsconfig.config.json b/webUI/tsconfig.config.json
old mode 100755
new mode 100644
diff --git a/webUI/tsconfig.json b/webUI/tsconfig.json
old mode 100755
new mode 100644
diff --git a/webUI/vite.config.ts b/webUI/vite.config.ts
old mode 100755
new mode 100644
diff --git a/webUI/workbox-config.js b/webUI/workbox-config.js
old mode 100755
new mode 100644