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

bug fix in create business

Browse source
This commit is contained in:
babak alizadeh 2024-07-19 00:39:40 +03:30
parent fbd1a904f2
commit c9bf77eaa2
3 changed files with 50 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -240,8 +240,7 @@ class BusinessController extends AbstractController
$year->setStart($jdate->jmktime(0, 0, 0, $startYearArray[1], $startYearArray[2], $startYearArray[0])); $year->setStart($jdate->jmktime(0, 0, 0, $startYearArray[1], $startYearArray[2], $startYearArray[0]));
$endYearArray = explode('-', $params['year']['end']); $endYearArray = explode('-', $params['year']['end']);
if(count($endYearArray) == 1) $startYearArray = explode('/', $params['year']['end']); if(count($endYearArray) == 1) $endYearArray = explode('/', $params['year']['end']);
$year->setEnd($jdate->jmktime(0, 0, 0, $endYearArray[1], $endYearArray[2], $endYearArray[0])); $year->setEnd($jdate->jmktime(0, 0, 0, $endYearArray[1], $endYearArray[2], $endYearArray[0]));
$year->setLabel($params['year']['label']); $year->setLabel($params['year']['label']);
$entityManager->persist($year); $entityManager->persist($year);

48
hesabixCore/src/Controller/CommodityController.php
View file

@ -265,6 +265,28 @@ class CommodityController extends AbstractController
$res['count'] = $count; $res['count'] = $count;
} }
//calculate other prices
$pricesAll = $entityManager->getRepository(PriceList::class)->findBy([
'bid' => $acc['bid']
]);
foreach($pricesAll as $item){
$priceDetails = $entityManager->getRepository(PriceListDetail::class)->findOneBy([
'list'=> $item,
'commodity' => $data
]);
if($priceDetails){
$res['prices'][] = Explore::ExploreCommodityPriceListDetail($priceDetails);
}
else{
$spd = new PriceListDetail;
$spd->setList($item);
$spd->setMoney($acc['bid']->getMoney());
$spd->setCommodity($data);
$spd->setPriceBuy(0);
$spd->setPriceSell(0);
$res['prices'][] = Explore::ExploreCommodityPriceListDetail($spd);
}
}
return $this->json($res); return $this->json($res);
} }
@ -338,6 +360,8 @@ class CommodityController extends AbstractController
} }
} }
$entityManager->persist($data); $entityManager->persist($data);
//save prices list
if (array_key_exists('prices', $params)) { if (array_key_exists('prices', $params)) {
foreach ($params['prices'] as $item) { foreach ($params['prices'] as $item) {
$priceList = $entityManager->getRepository(PriceList::class)->findOneBy([ $priceList = $entityManager->getRepository(PriceList::class)->findOneBy([
@ -347,6 +371,7 @@ class CommodityController extends AbstractController
if ($priceList) { if ($priceList) {
$detail = $entityManager->getRepository(PriceListDetail::class)->findOneBy([ $detail = $entityManager->getRepository(PriceListDetail::class)->findOneBy([
'list' => $priceList, 'list' => $priceList,
'commodity' => $data
]); ]);
if (!$detail) { if (!$detail) {
$detail = new PriceListDetail; $detail = new PriceListDetail;
@ -735,6 +760,29 @@ class CommodityController extends AbstractController
return $this->json(Explore::ExploreCommodityPriceList($items)); return $this->json(Explore::ExploreCommodityPriceList($items));
} }
#[Route('/api/commodity/pricelist/view/{id}', name: 'app_commodity_pricelist_view')]
public function app_commodity_pricelist_view($id,Provider $provider, Request $request, Access $access, Log $log, EntityManagerInterface $entityManager): JsonResponse
{
$acc = $access->hasRole('commodity');
if (!$acc)
throw $this->createAccessDeniedException();
$price = $entityManager->getRepository(PriceList::class)->findOneBy([
'bid' => $acc['bid'],
'id' => $id
]);
$items = $entityManager->getRepository(PriceListDetail::class)->findBy([
'list' => $price
]);
$res = [];
foreach($items as $item){
$temp = [];
$temp['id'] = $item->getId();
$temp['commodity'] = Explore::ExploreCommodity($item->getCommodity());
$temp['priceSell'] = $item->getPriceSell();
$res[] = $temp;
}
return $this->json($res);
}
#[Route('/api/commodity/pricelist/mod/{code}', name: 'app_commodity_pricelist_mod')] #[Route('/api/commodity/pricelist/mod/{code}', name: 'app_commodity_pricelist_mod')]
public function app_commodity_pricelist_mod(Provider $provider, Request $request, Access $access, Log $log, EntityManagerInterface $entityManager, $code = 0): JsonResponse public function app_commodity_pricelist_mod(Provider $provider, Request $request, Access $access, Log $log, EntityManagerInterface $entityManager, $code = 0): JsonResponse
{ {

3
hesabixCore/src/Service/Explore.php
View file

@ -31,7 +31,7 @@ class Explore
{ {
return [ return [
'id' => $item->getId(), 'id' => $item->getId(),
'label' => $item->getLabel() 'label' => $item->getLabel(),
]; ];
} }
public static function ExplorePersonType(PersonType $type) public static function ExplorePersonType(PersonType $type)
@ -199,7 +199,6 @@ class Explore
'name' => $item->getUnit()->getName(), 'name' => $item->getUnit()->getName(),
'floatNumber' => $item->getUnit()->getFloatNumber(), 'floatNumber' => $item->getUnit()->getFloatNumber(),
], ],
'prices'=>self::ExploreCommodityPriceListDetails($item->getPriceListDetails())
]; ];
if($des){ $result['des'] = $des;} if($des){ $result['des'] = $des;}
return $result; return $result;