morrning/hesabixCore
1
1
Fork 1
Code Issues Pull requests Actions Packages Projects Releases 2 Wiki Activity

update for Moadian plugin

Browse source
This commit is contained in:
Gloomy 2025-08-18 20:33:09 +00:00
parent dd78e12a7a
commit 484c7a0a64
1 changed files with 48 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
hesabixCore/src/Controller/Plugins/TaxSettingsController.php
View file

@ -555,6 +555,7 @@ class TaxSettingsController extends AbstractController
$itemDiscountType = $row->getDiscountType() ?? 'fixed'; $itemDiscountType = $row->getDiscountType() ?? 'fixed';
$itemDiscountPercent = $row->getDiscountPercent() ?? 0; $itemDiscountPercent = $row->getDiscountPercent() ?? 0;
$itemTax = $row->getTax() ?? 0; $itemTax = $row->getTax() ?? 0;
$count = $row->getCommdityCount() ?? 0;
if ($itemDiscountType === 'percent' && $itemDiscountPercent > 0) { if ($itemDiscountType === 'percent' && $itemDiscountPercent > 0) {
$originalPrice = $basePrice / (1 - ($itemDiscountPercent / 100)); $originalPrice = $basePrice / (1 - ($itemDiscountPercent / 100));
@ -562,8 +563,8 @@ class TaxSettingsController extends AbstractController
} else { } else {
$originalPrice = $basePrice + $itemDiscount; $originalPrice = $basePrice + $itemDiscount;
} }
$unitPrice = $count > 0 ? $originalPrice / $count : 0;
$unitPrice = $row->getCommdityCount() > 0 ? $originalPrice / $row->getCommdityCount() : 0; $es = $count > 0 ? ($unitPrice * $count) : $originalPrice;
$netPrice = $basePrice; $netPrice = $basePrice;
$totalInvoice += $netPrice; $totalInvoice += $netPrice;
@ -574,8 +575,9 @@ class TaxSettingsController extends AbstractController
'name' => $row->getCommodity()->getName(), 'name' => $row->getCommodity()->getName(),
'code' => $row->getCommodity()->getCode() 'code' => $row->getCommodity()->getCode()
], ],
'count' => $row->getCommdityCount(), 'count' => $count,
'price' => $unitPrice, 'price' => $unitPrice,
'prdis' => $es,
'discountPercent' => $itemDiscountPercent, 'discountPercent' => $itemDiscountPercent,
'discountAmount' => $itemDiscount, 'discountAmount' => $itemDiscount,
'total' => $netPrice, 'total' => $netPrice,
@ -1229,7 +1231,7 @@ class TaxSettingsController extends AbstractController
->setScc(null) ->setScc(null)
->setCrn(null) ->setCrn(null)
->setBillid(null) ->setBillid(null)
->setTprdis($data['totalInvoice']) ->setTprdis(array_sum(array_column($data['items'], 'prdis')))
->setTdis($data['totalDiscount']) ->setTdis($data['totalDiscount'])
->setTadis($data['totalInvoice'] - $data['totalDiscount']) ->setTadis($data['totalInvoice'] - $data['totalDiscount'])
->setTvam($totalTax) ->setTvam($totalTax)
@ -1244,10 +1246,20 @@ class TaxSettingsController extends AbstractController
foreach ($data['items'] as $item) { foreach ($data['items'] as $item) {
$itemTax = $item['tax']; $itemTax = $item['tax'];
$itemTotal = $item['total'] + $itemTax;
$vra = $this->calculateVra($item['total'], $itemTax, $invoice); $vra = $this->calculateVra($item['total'], $itemTax, $invoice);
$prdis = $item['count'] * $item['price'];
$adis = $prdis - $item['discountAmount'];
$ks = ($adis * $vra) / 100;
$ks2 = 0;
$ks3 = 0;
$os = $adis + $ks + $ks2 + $ks3;
$bodyDto = (new \SnappMarketPro\Moadian\Dto\InvoiceBodyDto()) $bodyDto = (new \SnappMarketPro\Moadian\Dto\InvoiceBodyDto())
->setSstid($this->getCommodityTaxCodeFromInvoice($invoice, $item['name']['id'])) ->setSstid($this->getCommodityTaxCodeFromInvoice($invoice, $item['name']['id']))
->setSstt($item['name']['name']) ->setSstt($item['name']['name'])
@ -1257,11 +1269,11 @@ class TaxSettingsController extends AbstractController
->setCfee(null) ->setCfee(null)
->setCut(null) ->setCut(null)
->setExr(null) ->setExr(null)
->setPrdis($item['total']) ->setPrdis($prdis)
->setDis($item['discountAmount']) ->setDis($item['discountAmount'])
->setAdis($item['total'] - $item['discountAmount']) ->setAdis($adis)
->setVra($vra) ->setVra($vra)
->setVam($itemTax) ->setVam($ks)
->setOdt(null) ->setOdt(null)
->setOdr(null) ->setOdr(null)
->setOdam(null) ->setOdam(null)
@ -1275,7 +1287,7 @@ class TaxSettingsController extends AbstractController
->setCop(null) ->setCop(null)
->setVop(null) ->setVop(null)
->setBsrn(null) ->setBsrn(null)
->setTsstam($itemTotal); ->setTsstam($os);
$bodyItems[] = $bodyDto; $bodyItems[] = $bodyDto;
} }
@ -1611,7 +1623,6 @@ class TaxSettingsController extends AbstractController
$buyerEconomicCode = null; $buyerEconomicCode = null;
$missingFields = []; $missingFields = [];
// دریافت شخص خریدار از ردیف‌های فاکتور
foreach ($invoice->getHesabdariRows() as $row) { foreach ($invoice->getHesabdariRows() as $row) {
if ($row->getPerson()) { if ($row->getPerson()) {
$buyerPerson = $row->getPerson(); $buyerPerson = $row->getPerson();