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

bug fix in shortlinks

Browse source
This commit is contained in:
Hesabix 2025-02-21 12:26:48 +00:00
parent cbb53524ae
commit b23cfe61bd
6 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hesabixCore/src/Controller/BusinessController.php
View file

@ -255,7 +255,7 @@ class BusinessController extends AbstractController
$business->setMoney($Arzmain); $business->setMoney($Arzmain);
else else
return $this->json(['result' => 2]); return $this->json(['result' => 2]);
} }
if (!$business->getDateSubmit()) if (!$business->getDateSubmit())
$business->setDateSubmit(time()); $business->setDateSubmit(time());
$entityManager->persist($business); $entityManager->persist($business);

11
hesabixCore/src/Controller/Front/ShortlinksController.php
View file

@ -27,11 +27,11 @@ class ShortlinksController extends AbstractController
]); ]);
if (!$ticket) if (!$ticket)
throw $this->createNotFoundException(); throw $this->createNotFoundException();
if(!$ticket->isCanShare()) if (!$ticket->isCanShare())
throw $this->createAccessDeniedException(); throw $this->createAccessDeniedException();
$person = null; $person = null;
foreach ($ticket->getDoc()->getHesabdariRows() as $item) { foreach ($ticket->getDoc()->getHesabdariRows() as $item) {
if ($item->getPerson()) { if ($item->getPerson()) {
$person = $item->getPerson(); $person = $item->getPerson();
@ -40,12 +40,12 @@ class ShortlinksController extends AbstractController
return $this->render('shortlinks/storeroom.html.twig', [ return $this->render('shortlinks/storeroom.html.twig', [
'bid' => $bus, 'bid' => $bus,
'doc' => $ticket, 'doc' => $ticket,
'person'=>$person 'person' => $person
]); ]);
} }
#[Route('/sl/{type}/{bid}/{link}/{msg}', name: 'shortlinks_show')] #[Route('/sl/{type}/{bid}/{link}/{msg}', name: 'shortlinks_show')]
public function shortlinks_show(string $bid, string $type, string $link, EntityManagerInterface $entityManager, string $msg = 'default'): Response public function shortlinks_show(Provider $provider, string $bid, string $type, string $link, EntityManagerInterface $entityManager, string $msg = 'default'): Response
{ {
$bus = $entityManager->getRepository(Business::class)->find($bid); $bus = $entityManager->getRepository(Business::class)->find($bid);
if (!$bus) if (!$bus)
@ -55,7 +55,8 @@ class ShortlinksController extends AbstractController
if ($type == 'sell') { if ($type == 'sell') {
$doc = $entityManager->getRepository(HesabdariDoc::class)->findOneBy([ $doc = $entityManager->getRepository(HesabdariDoc::class)->findOneBy([
'type' => 'sell', 'type' => 'sell',
'shortlink' => $link 'shortlink' => $link,
'bid' => $bus
]); ]);
if (!$doc) { if (!$doc) {
$doc = $entityManager->getRepository(HesabdariDoc::class)->findOneBy([ $doc = $entityManager->getRepository(HesabdariDoc::class)->findOneBy([

6
hesabixCore/src/Controller/HesabdariController.php
View file

@ -54,6 +54,12 @@ class HesabdariController extends AbstractController
]); ]);
if (!$doc) if (!$doc)
throw $this->createNotFoundException(); throw $this->createNotFoundException();
//add shortlink to doc
if (!$doc->getShortlink()) {
$doc->setShortlink($provider->RandomString(8));
$entityManager->persist($doc);
$entityManager->flush();
}
$rows = []; $rows = [];
$rowsObj = $entityManager->getRepository(HesabdariRow::class)->findBy( $rowsObj = $entityManager->getRepository(HesabdariRow::class)->findBy(
['doc' => $doc] ['doc' => $doc]

2
hesabixCore/src/Controller/PreinvoiceController.php
View file

@ -226,7 +226,7 @@ class PreinvoiceController extends AbstractController
$entityManager->persist($doc); $entityManager->persist($doc);
$entityManager->flush(); $entityManager->flush();
if(!$doc->getShortlink()){ if(!$doc->getShortlink()){
$doc->setShortlink($doc->getId()); $doc->setShortlink($provider->RandomString(8));
} }
//add pair docs //add pair docs

9
hesabixCore/src/Controller/SMSController.php
View file

@ -189,9 +189,12 @@ class SMSController extends AbstractController
]); ]);
if (!$doc) if (!$doc)
return $this->json(['result' => 3]); return $this->json(['result' => 3]);
$shortLink = $doc->getId(); if(!$doc->getShortlink()){
if ($doc->getShortlink()) $doc->setShortlink($provider->RandomString(8));
$shortLink = $doc->getShortlink(); $entityManager->persist($doc);
$entityManager->flush();
}
$shortLink = $doc->getShortlink();
//find custommer //find custommer
$customer = null; $customer = null;

8
hesabixCore/src/Controller/SellController.php
View file

@ -249,7 +249,7 @@ class SellController extends AbstractController
$entityManager->persist($doc); $entityManager->persist($doc);
$entityManager->flush(); $entityManager->flush();
if (!$doc->getShortlink()) { if (!$doc->getShortlink()) {
$doc->setShortlink($doc->getId()); $doc->setShortlink($provider->RandomString(8));
} }
//add pair docs //add pair docs
@ -437,7 +437,11 @@ class SellController extends AbstractController
} else { } else {
$temp['profit'] = $temp['profit'] + $item->getBs(); $temp['profit'] = $temp['profit'] + $item->getBs();
} }
} else { }
else if ($acc['bid']->getProfitCalctype() == 'simple') {
$temp['profit'] = $temp['profit'] + (($item->getCommodity()->getPriceSell() - $item->getCommodity()->getPriceBuy()) * $item->getCommdityCount());
}
else {
$lasts = $entityManager->getRepository(HesabdariRow::class)->findBy([ $lasts = $entityManager->getRepository(HesabdariRow::class)->findBy([
'commodity' => $item->getCommodity(), 'commodity' => $item->getCommodity(),
'bs' => 0 'bs' => 0