From 194bc613d3935eac9185739405e68429a817ee5f Mon Sep 17 00:00:00 2001 From: Babak Alizadeh Date: Sun, 8 Jun 2025 01:42:08 +0000 Subject: [PATCH] bug fix and add some new options --- .../src/Controller/CashdeskController.php | 134 +++ .../src/Controller/HesabdariController.php | 261 +++-- .../src/Controller/PersonsController.php | 46 +- .../templates/pdf/cashdesk_card.html.twig | 116 +++ .../templates/pdf/printers/buy.html.twig | 2 +- .../templates/pdf/printers/rfbuy.html.twig | 2 +- .../templates/pdf/printers/rfsell.html.twig | 2 +- .../templates/pdf/printers/sell.html.twig | 28 +- webUI/package.json | 2 +- .../src/components/forms/Htabletreeselect.vue | 7 +- webUI/src/i18n/fa_lang.ts | 1 + webUI/src/views/acc/accounting/list.vue | 268 ++++- webUI/src/views/acc/cashdesk/card.vue | 273 +++-- webUI/src/views/acc/cashdesk/list.vue | 456 ++++++--- webUI/src/views/acc/costs/mod.vue | 14 +- webUI/src/views/acc/incomes/mod.vue | 963 ++++++++---------- webUI/src/views/acc/settings/print.vue | 12 +- 17 files changed, 1721 insertions(+), 866 deletions(-) create mode 100644 hesabixCore/templates/pdf/cashdesk_card.html.twig diff --git a/hesabixCore/src/Controller/CashdeskController.php b/hesabixCore/src/Controller/CashdeskController.php index 10544e9..c45374c 100644 --- a/hesabixCore/src/Controller/CashdeskController.php +++ b/hesabixCore/src/Controller/CashdeskController.php @@ -14,6 +14,12 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; +use PhpOffice\PhpSpreadsheet\Spreadsheet; +use PhpOffice\PhpSpreadsheet\Writer\Xlsx; +use PhpOffice\PhpSpreadsheet\Writer\Exception; +use Symfony\Component\HttpFoundation\BinaryFileResponse; +use Symfony\Component\HttpFoundation\StreamedResponse; +use Symfony\Component\HttpFoundation\ResponseHeaderBag; class CashdeskController extends AbstractController { @@ -268,4 +274,132 @@ class CashdeskController extends AbstractController 'total' => count($transactions) ]); } + + /** + * @throws Exception + */ + #[Route('/api/cashdesk/card/list/excel', name: 'app_cashdesk_card_list_excel')] + public function app_cashdesk_card_list_excel(Provider $provider, Request $request, Access $access, Log $log, EntityManagerInterface $entityManager): BinaryFileResponse|JsonResponse|StreamedResponse + { + $acc = $access->hasRole('cashdesk'); + if (!$acc) + throw $this->createAccessDeniedException(); + $params = []; + if ($content = $request->getContent()) { + $params = json_decode($content, true); + } + if (!array_key_exists('code', $params)) + throw $this->createNotFoundException(); + $cashdesk = $entityManager->getRepository(Cashdesk::class)->findOneBy(['bid' => $acc['bid'], 'code' => $params['code']]); + if (!$cashdesk) + throw $this->createNotFoundException(); + if (!array_key_exists('items', $params)) { + $transactions = $entityManager->getRepository(HesabdariRow::class)->findBy([ + 'bid' => $acc['bid'], + 'cashdesk' => $cashdesk, + 'year'=>$acc['year'] + ]); + } else { + $transactions = []; + foreach ($params['items'] as $param) { + $prs = $entityManager->getRepository(HesabdariRow::class)->findOneBy([ + 'id' => $param['id'], + 'bid' => $acc['bid'], + 'cashdesk' => $cashdesk, + 'year' => $acc['year'] + ]); + if ($prs) { + $transactions[] = $prs; + } + } + } + $spreadsheet = new Spreadsheet(); + $activeWorksheet = $spreadsheet->getActiveSheet(); + $arrayEntity = [ + [ + 'شماره تراکنش', + 'تاریخ', + 'توضیحات', + 'شرح سند', + 'تفضیل', + 'بستانکار', + 'بدهکار', + 'سال مالی', + ] + ]; + foreach ($transactions as $transaction) { + $arrayEntity[] = [ + $transaction->getId(), + $transaction->getDoc()->getDate(), + $transaction->getDes(), + $transaction->getDoc()->getDes(), + $transaction->getRef()->getName(), + $transaction->getBs(), + $transaction->getBd(), + $transaction->getYear()->getlabel() + ]; + } + $activeWorksheet->fromArray($arrayEntity, null, 'A1'); + $activeWorksheet->setRightToLeft(true); + $writer = new Xlsx($spreadsheet); + $fileName = 'کارت حساب صندوق ' . $cashdesk->getName() . '.xlsx'; + $filePath = __DIR__ . '/../../var/' . $fileName; + $writer->save($filePath); + + $response = new BinaryFileResponse($filePath); + $response->setContentDisposition( + ResponseHeaderBag::DISPOSITION_ATTACHMENT, + $fileName + ); + return $response; + } + + #[Route('/api/cashdesk/card/list/print', name: 'app_cashdesk_card_list_print')] + public function app_cashdesk_card_list_print(Provider $provider, Request $request, Access $access, Log $log, EntityManagerInterface $entityManager): JsonResponse + { + $acc = $access->hasRole('cashdesk'); + if (!$acc) + throw $this->createAccessDeniedException(); + $params = []; + if ($content = $request->getContent()) { + $params = json_decode($content, true); + } + if (!array_key_exists('code', $params)) + throw $this->createNotFoundException(); + $cashdesk = $entityManager->getRepository(Cashdesk::class)->findOneBy(['bid' => $acc['bid'], 'code' => $params['code']]); + if (!$cashdesk) + throw $this->createNotFoundException(); + + if (!array_key_exists('items', $params)) { + $transactions = $entityManager->getRepository(HesabdariRow::class)->findBy([ + 'bid' => $acc['bid'], + 'cashdesk' => $cashdesk, + 'year'=>$acc['year'] + ]); + } else { + $transactions = []; + foreach ($params['items'] as $param) { + $prs = $entityManager->getRepository(HesabdariRow::class)->findOneBy([ + 'id' => $param['id'], + 'bid' => $acc['bid'], + 'cashdesk' => $cashdesk, + 'year'=>$acc['year'] + ]); + if ($prs) { + $transactions[] = $prs; + } + } + } + $pid = $provider->createPrint( + $acc['bid'], + $this->getUser(), + $this->renderView('pdf/cashdesk_card.html.twig', [ + 'page_title' => 'کارت حساب' . ' ' . $cashdesk->getName(), + 'bid' => $acc['bid'], + 'items' => $transactions, + 'cashdesk' => $cashdesk + ]) + ); + return $this->json(['id' => $pid]); + } } diff --git a/hesabixCore/src/Controller/HesabdariController.php b/hesabixCore/src/Controller/HesabdariController.php index d5d634c..0aeac3b 100644 --- a/hesabixCore/src/Controller/HesabdariController.php +++ b/hesabixCore/src/Controller/HesabdariController.php @@ -33,6 +33,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Annotation\Route; +use App\Repository\HesabdariTableRepository; class HesabdariController extends AbstractController { @@ -179,96 +180,192 @@ class HesabdariController extends AbstractController ]); } - #[Route('/api/accounting/search', name: 'app_accounting_search')] - public function app_accounting_search(Provider $provider, Request $request, Access $access, Log $log, EntityManagerInterface $entityManager): JsonResponse - { - $params = []; - if ($content = $request->getContent()) { - $params = json_decode($content, true); - } - if (!array_key_exists('type', $params)) - $this->createNotFoundException(); - $roll = ''; - if ($params['type'] == 'person_receive' || $params['type'] == 'person_send') - $roll = 'person'; - elseif ($params['type'] == 'cost') - $roll = 'cost'; - elseif ($params['type'] == 'income') - $roll = 'income'; - elseif ($params['type'] == 'buy') - $roll = 'buy'; - elseif ($params['type'] == 'rfbuy') - $roll = 'plugAccproRfbuy'; - elseif ($params['type'] == 'transfer') - $roll = 'bankTransfer'; - elseif ($params['type'] == 'sell') - $roll = 'sell'; - elseif ($params['type'] == 'rfsell') - $roll = 'plugAccproRfsell'; - elseif ($params['type'] == 'all') - $roll = 'accounting'; - else - $this->createNotFoundException(); - - $acc = $access->hasRole($roll); - if (!$acc) + #[Route('/api/accounting/search', name: 'app_hesabdari_search', methods: ['POST'])] + public function search( + Request $request, + Access $access, + EntityManagerInterface $entityManager, + HesabdariTableRepository $hesabdariTableRepository, + Jdate $jdate + ): JsonResponse { + $acc = $access->hasRole('acc'); + if (!$acc) { throw $this->createAccessDeniedException(); - if ($params['type'] == 'all') { - $data = $entityManager->getRepository(HesabdariDoc::class)->findBy([ - 'bid' => $acc['bid'], - 'year' => $acc['year'], - 'money' => $acc['money'] - ], [ - 'id' => 'DESC' - ]); - } else { - $data = $entityManager->getRepository(HesabdariDoc::class)->findBy([ - 'bid' => $acc['bid'], - 'year' => $acc['year'], - 'type' => $params['type'], - 'money' => $acc['money'] - ], [ - 'id' => 'DESC' - ]); } + + $params = json_decode($request->getContent(), true) ?? []; + + // Input parameters + $filters = $params['filters'] ?? []; + $pagination = $params['pagination'] ?? ['page' => 1, 'limit' => 10]; + $sort = $params['sort'] ?? ['sortBy' => 'id', 'sortDesc' => true]; + $type = $params['type'] ?? 'all'; + + // Set pagination parameters + $page = max(1, $pagination['page'] ?? 1); + $limit = max(1, min(100, $pagination['limit'] ?? 10)); + + // Build base query + $queryBuilder = $entityManager->createQueryBuilder() + ->select('DISTINCT d.id, d.dateSubmit, d.date, d.type, d.code, d.des, d.amount') + ->addSelect('u.fullName as submitter') + ->from('App\Entity\HesabdariDoc', 'd') + ->leftJoin('d.submitter', 'u') + ->leftJoin('d.hesabdariRows', 'r') + ->leftJoin('r.ref', 't') + ->where('d.bid = :bid') + ->andWhere('d.year = :year') + ->andWhere('d.money = :money') + ->setParameter('bid', $acc['bid']) + ->setParameter('year', $acc['year']) + ->setParameter('money', $acc['money']); + + // Add type filter if not 'all' + if ($type !== 'all') { + $queryBuilder->andWhere('d.type = :type') + ->setParameter('type', $type); + } + + // Apply filters + if (!empty($filters)) { + // Text search + if (isset($filters['search'])) { + $searchValue = is_array($filters['search']) ? $filters['search']['value'] : $filters['search']; + $queryBuilder->leftJoin('r.person', 'p') + ->andWhere( + $queryBuilder->expr()->orX( + 'd.code LIKE :search', + 'd.des LIKE :search', + 'd.date LIKE :search', + 'd.amount LIKE :search', + 'p.nikename LIKE :search', + 't.name LIKE :search', + 't.code LIKE :search' + ) + ) + ->setParameter('search', "%{$searchValue}%"); + } + + // Account filter + if (isset($filters['account'])) { + $accountCodes = $hesabdariTableRepository->findAllSubAccountCodes($filters['account'], $acc['bid']->getId()); + if (!empty($accountCodes)) { + $queryBuilder->andWhere('t.code IN (:accountCodes)') + ->setParameter('accountCodes', $accountCodes); + } else { + $queryBuilder->andWhere('1 = 0'); + } + } + + // Time filter + if (isset($filters['timeFilter'])) { + $today = $jdate->jdate('Y/m/d', time()); + switch ($filters['timeFilter']) { + case 'today': + $queryBuilder->andWhere('d.date = :today') + ->setParameter('today', $today); + break; + case 'week': + $weekStart = $jdate->jdate('Y/m/d', strtotime('-6 days')); + $queryBuilder->andWhere('d.date BETWEEN :weekStart AND :today') + ->setParameter('weekStart', $weekStart) + ->setParameter('today', $today); + break; + case 'month': + $monthStart = $jdate->jdate('Y/m/01', time()); + $queryBuilder->andWhere('d.date BETWEEN :monthStart AND :today') + ->setParameter('monthStart', $monthStart) + ->setParameter('today', $today); + break; + case 'custom': + if (isset($filters['date']) && isset($filters['date']['from']) && isset($filters['date']['to'])) { + // تبدیل تاریخ‌های شمسی به میلادی + $fromDate = $filters['date']['from']; + $toDate = $filters['date']['to']; + + // اطمینان از فرمت صحیح تاریخ‌ها + if (strpos($fromDate, '/') !== false && strpos($toDate, '/') !== false) { + $queryBuilder->andWhere('d.date BETWEEN :dateFrom AND :dateTo') + ->setParameter('dateFrom', $fromDate) + ->setParameter('dateTo', $toDate); + } + } + break; + } + } + } + + // Apply sorting + $sortField = is_array($sort['sortBy']) ? ($sort['sortBy']['key'] ?? 'id') : ($sort['sortBy'] ?? 'id'); + $sortDirection = ($sort['sortDesc'] ?? true) ? 'DESC' : 'ASC'; + $queryBuilder->orderBy("d.$sortField", $sortDirection); + + // Calculate total items + $totalItemsQuery = clone $queryBuilder; + $totalItems = $totalItemsQuery->select('COUNT(DISTINCT d.id)') + ->getQuery() + ->getSingleScalarResult(); + + // Apply pagination + $queryBuilder->setFirstResult(($page - 1) * $limit) + ->setMaxResults($limit); + + $docs = $queryBuilder->getQuery()->getArrayResult(); + $dataTemp = []; - foreach ($data as $item) { - $temp = [ - 'id' => $item->getId(), - 'dateSubmit' => $item->getDateSubmit(), - 'date' => $item->getDate(), - 'type' => $item->getType(), - 'code' => $item->getCode(), - 'des' => $item->getDes(), - 'amount' => $item->getAmount(), - 'submitter' => $item->getSubmitter()->getFullName(), + foreach ($docs as $doc) { + $item = [ + 'id' => $doc['id'], + 'dateSubmit' => $doc['dateSubmit'], + 'date' => $doc['date'], + 'type' => $doc['type'], + 'code' => $doc['code'], + 'des' => $doc['des'], + 'amount' => $doc['amount'], + 'submitter' => $doc['submitter'], ]; - if ($params['type'] == 'rfsell' || $params['type'] == 'rfbuy' || $params['type'] == 'buy' || $params['type'] == 'sell') { - $mainRow = $entityManager->getRepository(HesabdariRow::class)->getNotEqual($item, 'person'); - $temp['person'] = ''; - if ($mainRow) - $temp['person'] = Explore::ExplorePerson($mainRow->getPerson()); + + // Get related person info if applicable + if (in_array($doc['type'], ['rfsell', 'rfbuy', 'buy', 'sell'])) { + $personInfo = $entityManager->createQueryBuilder() + ->select('p.id, p.nikename, p.code') + ->from('App\Entity\HesabdariRow', 'r') + ->join('r.person', 'p') + ->where('r.doc = :docId') + ->andWhere('r.person IS NOT NULL') + ->setParameter('docId', $doc['id']) + ->setMaxResults(1) + ->getQuery() + ->getOneOrNullResult(); + + $item['person'] = $personInfo ? [ + 'id' => $personInfo['id'], + 'nikename' => $personInfo['nikename'], + 'code' => $personInfo['code'], + ] : null; } - $temp['label'] = null; - if ($item->getInvoiceLabel()) { - $temp['label'] = [ - 'code' => $item->getInvoiceLabel()->getCode(), - 'label' => $item->getInvoiceLabel()->getLabel() - ]; - } - //get status of doc - $temp['status'] = 'تسویه نشده'; - $pays = 0; - foreach ($item->getRelatedDocs() as $relatedDoc) { - $pays += $relatedDoc->getAmount(); - } - if ($item->getAmount() <= $pays) - $temp['status'] = 'تسویه شده'; + // Get payment status + $pays = $entityManager->createQueryBuilder() + ->select('SUM(rd.amount) as total_pays') + ->from('App\Entity\HesabdariDoc', 'd') + ->leftJoin('d.relatedDocs', 'rd') + ->where('d.id = :docId') + ->setParameter('docId', $doc['id']) + ->getQuery() + ->getSingleScalarResult(); - $dataTemp[] = $temp; + $item['status'] = ($pays && $pays >= $doc['amount']) ? 'تسویه شده' : 'تسویه نشده'; + + $dataTemp[] = $item; } - return $this->json($dataTemp); + + return $this->json([ + 'items' => $dataTemp, + 'total' => (int) $totalItems, + 'page' => $page, + 'limit' => $limit, + ]); } /** diff --git a/hesabixCore/src/Controller/PersonsController.php b/hesabixCore/src/Controller/PersonsController.php index 98eba9d..e9c83f7 100644 --- a/hesabixCore/src/Controller/PersonsController.php +++ b/hesabixCore/src/Controller/PersonsController.php @@ -943,15 +943,20 @@ class PersonsController extends AbstractController ], $acc['money']); } else { $transactions = []; - foreach ($params['items'] as $param) { - $prs = $entityManager->getRepository(HesabdariRow::class)->findByJoinMoney([ - 'id' => $param['id'], - 'bid' => $acc['bid'], - 'person' => $person, - 'year' => $acc['year'], - ], $acc['money']); - if (count($prs) != 0) { - $transactions[] = $prs[0]; + if (is_array($params['items'])) { + foreach ($params['items'] as $param) { + $id = is_array($param) ? ($param['id'] ?? null) : $param; + if ($id !== null) { + $prs = $entityManager->getRepository(HesabdariRow::class)->findByJoinMoney([ + 'id' => $id, + 'bid' => $acc['bid'], + 'person' => $person, + 'year' => $acc['year'], + ], $acc['money']); + if (count($prs) != 0) { + $transactions[] = $prs[0]; + } + } } } } @@ -1011,15 +1016,20 @@ class PersonsController extends AbstractController ], $acc['money']); } else { $transactions = []; - foreach ($params['items'] as $param) { - $prs = $entityManager->getRepository(HesabdariRow::class)->findByJoinMoney([ - 'id' => $param['id'], - 'bid' => $acc['bid'], - 'person' => $person, - 'year' => $acc['year'], - ], $acc['money']); - if (count($prs) != 0) { - $transactions[] = $prs[0]; + if (is_array($params['items'])) { + foreach ($params['items'] as $param) { + $id = is_array($param) ? ($param['id'] ?? null) : $param; + if ($id !== null) { + $prs = $entityManager->getRepository(HesabdariRow::class)->findByJoinMoney([ + 'id' => $id, + 'bid' => $acc['bid'], + 'person' => $person, + 'year' => $acc['year'], + ], $acc['money']); + if (count($prs) != 0) { + $transactions[] = $prs[0]; + } + } } } } diff --git a/hesabixCore/templates/pdf/cashdesk_card.html.twig b/hesabixCore/templates/pdf/cashdesk_card.html.twig new file mode 100644 index 0000000..6d6e975 --- /dev/null +++ b/hesabixCore/templates/pdf/cashdesk_card.html.twig @@ -0,0 +1,116 @@ +{% extends "pdf/base.html.twig" %} +{% block body %} +
+
+ کارت حساب صندوق +
+ + + + + + + + +
+

+ نام: + + {{ cashdesk.name }} +

+ 		+

+ + کد حسابداری: + + {{ cashdesk.code }} +

+ 		+

+ شرح: + + {{ cashdesk.des }} +

+
+
+
+ + + + + + + + + + + + + + {% set sumBs = 0 %} + {% set sumBd = 0 %} + {% for item in items %} + {% set sumBs = sumBs + item.bs %} + {% set sumBd = sumBd + item.bd %} + + + + + + + + + + + + {% endfor %} + +
ردیففاکتور/سندتاریختوضیحاتشرح سندتفضیلواریزبرداشتسال مالی
{{ loop.index }}{{ item.doc.code }}{{ item.doc.date }}{{ item.des }}{{ item.doc.des }}{{ item.ref.name }}{{ item.bd | number_format }}{{ item.bs | number_format }}{{ item.year.label }}
+ +
+
+
+ وضعیت حساب +
+ + + + + + + + + +
+

+ جمع برداشت: + + {{ sumBs | number_format }} +

+ 		+

+ جمع واریز: + + {{ sumBd | number_format }} +

+ 		+

+ تراز حساب: + + {{ (sumBs - sumBd) | abs |number_format }} +

+ 		+

+ وضعیت: + + {% if sumBs > sumBd%} + برداشت + {% elseif sumBs == sumBd %} + تسویه شده + {% else %} + واریز + {% endif %} +

+
+
+{% endblock %} \ No newline at end of file diff --git a/hesabixCore/templates/pdf/printers/buy.html.twig b/hesabixCore/templates/pdf/printers/buy.html.twig index 64f977a..b7724d1 100644 --- a/hesabixCore/templates/pdf/printers/buy.html.twig +++ b/hesabixCore/templates/pdf/printers/buy.html.twig @@ -255,7 +255,7 @@ {% endif %} diff --git a/hesabixCore/templates/pdf/printers/rfbuy.html.twig b/hesabixCore/templates/pdf/printers/rfbuy.html.twig index 1c3e2f0..224a53a 100644 --- a/hesabixCore/templates/pdf/printers/rfbuy.html.twig +++ b/hesabixCore/templates/pdf/printers/rfbuy.html.twig @@ -255,7 +255,7 @@ {% endif %} diff --git a/hesabixCore/templates/pdf/printers/rfsell.html.twig b/hesabixCore/templates/pdf/printers/rfsell.html.twig index 832abdc..ea00afb 100644 --- a/hesabixCore/templates/pdf/printers/rfsell.html.twig +++ b/hesabixCore/templates/pdf/printers/rfsell.html.twig @@ -255,7 +255,7 @@ {% endif %} diff --git a/hesabixCore/templates/pdf/printers/sell.html.twig b/hesabixCore/templates/pdf/printers/sell.html.twig index 1d2b56b..a2ea126 100644 --- a/hesabixCore/templates/pdf/printers/sell.html.twig +++ b/hesabixCore/templates/pdf/printers/sell.html.twig @@ -236,33 +236,33 @@ {% set originalPrice = item.bs + item.discount %} {% set unitPrice = originalPrice / item.commodityCount %} {% endif %} - {{ unitPrice|round|number_format }} + {{ unitPrice|round|number_format }} {{ doc.money.shortName }} {% else %} - 0 + 0 {{ doc.money.shortName }} {% endif %} {% if printOptions.discountInfo %} {% if item.showPercentDiscount %} {{ item.discountPercent }}% - ({{ (item.bs * item.commodityCount * item.discountPercent / 100)|round|number_format }}) + ({{ (item.bs * item.commodityCount * item.discountPercent / 100)|round|number_format }} {{ doc.money.shortName }}) {% else %} - {{ item.discount|number_format }} + {{ item.discount|number_format }} {{ doc.money.shortName }} {% endif %} {% if item.showPercentDiscount %} {% set originalPrice = item.bs / (1 - (item.discountPercent / 100)) %} - {{ originalPrice|round|number_format }} + {{ originalPrice|round|number_format }} {{ doc.money.shortName }} {% else %} - {{ (item.bs + item.discount)|number_format }} + {{ (item.bs + item.discount)|number_format }} {{ doc.money.shortName }} {% endif %} {% endif %} {% if printOptions.taxInfo %} - {{ item.tax | number_format}} + {{ item.tax | number_format}} {{ doc.money.shortName }} {% endif %} - {{ item.bs| number_format }} + {{ item.bs| number_format }} {{ doc.money.shortName }} {% endif %} {% endfor %} @@ -296,7 +296,7 @@ {% endif %} @@ -306,25 +306,25 @@

تخفیف: - {{discount | number_format}} + {{discount | number_format}} {{ doc.money.shortName }}

مالیات: - {{taxAll | number_format}} + {{taxAll | number_format}} {{ doc.money.shortName }}

حمل و نقل: - {{transfer | number_format}} + {{transfer | number_format}} {{ doc.money.shortName }}

{% if doc.amount != (doc.amount + discount) %}

جمع بدون تخفیف: - {{ (doc.amount + discount) | number_format}} + {{ (doc.amount + discount) | number_format}} {{ doc.money.shortName }}

{% endif %}

جمع کل: - {{ doc.amount | number_format }} + {{ doc.amount | number_format }} {{ doc.money.shortName }}

diff --git a/webUI/package.json b/webUI/package.json index f768ddc..191b73a 100644 --- a/webUI/package.json +++ b/webUI/package.json @@ -1,6 +1,6 @@ { "name": "hesabix", - "version": "0.48.0", + "version": "0.49.8", "private": true, "scripts": { "dev": "vite", diff --git a/webUI/src/components/forms/Htabletreeselect.vue b/webUI/src/components/forms/Htabletreeselect.vue index 9bad467..73cab08 100644 --- a/webUI/src/components/forms/Htabletreeselect.vue +++ b/webUI/src/components/forms/Htabletreeselect.vue @@ -86,6 +86,11 @@ export default { returnObject: { type: Boolean, default: false + }, + tableType: { + type: String, + required: true, + validator: (value) => ['cost', 'income'].includes(value) } }, data() { @@ -135,7 +140,7 @@ export default { async fetchTreeData() { this.loading = true; try { - const response = await axios.get('/api/accounting/table/childs/cost'); + const response = await axios.get(`/api/accounting/table/childs/${this.tableType}`); this.treeItems = response.data; if (this.modelValue) { diff --git a/webUI/src/i18n/fa_lang.ts b/webUI/src/i18n/fa_lang.ts index 1f3dd43..cd1a9fc 100644 --- a/webUI/src/i18n/fa_lang.ts +++ b/webUI/src/i18n/fa_lang.ts @@ -100,6 +100,7 @@ const fa_lang = { ultimate_package: 'بسته‌های نامحدود', sell_chart: "فروش هفته گذشته", bankaccounts_transactions: "کارت حساب بانک", + cashdesk_transactions: "کارت حساب صندوق", print_queue: "صف چاپ", open_balance: "تراز افتتاحیه", sell_invoices_long: "فاکتور‌های فروش", diff --git a/webUI/src/views/acc/accounting/list.vue b/webUI/src/views/acc/accounting/list.vue index 561f2b8..b3e6ede 100644 --- a/webUI/src/views/acc/accounting/list.vue +++ b/webUI/src/views/acc/accounting/list.vue @@ -18,7 +18,89 @@ + placeholder="جست و جو ..."> + + @@ -151,8 +233,11 @@ diff --git a/webUI/src/views/acc/cashdesk/list.vue b/webUI/src/views/acc/cashdesk/list.vue index fe77452..2a97a9d 100644 --- a/webUI/src/views/acc/cashdesk/list.vue +++ b/webUI/src/views/acc/cashdesk/list.vue @@ -1,147 +1,329 @@