From c9bf77eaa2985876bfdc9aa4ae2d70d18b389cfe Mon Sep 17 00:00:00 2001 From: babak alizadeh Date: Fri, 19 Jul 2024 00:39:40 +0330 Subject: [PATCH] bug fix in create business --- .../src/Controller/BusinessController.php | 3 +- .../src/Controller/CommodityController.php | 48 +++++++++++++++++++ hesabixCore/src/Service/Explore.php | 3 +- 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/hesabixCore/src/Controller/BusinessController.php b/hesabixCore/src/Controller/BusinessController.php index 33272de..9de5b59 100644 --- a/hesabixCore/src/Controller/BusinessController.php +++ b/hesabixCore/src/Controller/BusinessController.php @@ -240,8 +240,7 @@ class BusinessController extends AbstractController $year->setStart($jdate->jmktime(0, 0, 0, $startYearArray[1], $startYearArray[2], $startYearArray[0])); $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->setLabel($params['year']['label']); $entityManager->persist($year); diff --git a/hesabixCore/src/Controller/CommodityController.php b/hesabixCore/src/Controller/CommodityController.php index 665d56b..b70bc25 100644 --- a/hesabixCore/src/Controller/CommodityController.php +++ b/hesabixCore/src/Controller/CommodityController.php @@ -265,6 +265,28 @@ class CommodityController extends AbstractController $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); } @@ -338,6 +360,8 @@ class CommodityController extends AbstractController } } $entityManager->persist($data); + + //save prices list if (array_key_exists('prices', $params)) { foreach ($params['prices'] as $item) { $priceList = $entityManager->getRepository(PriceList::class)->findOneBy([ @@ -347,6 +371,7 @@ class CommodityController extends AbstractController if ($priceList) { $detail = $entityManager->getRepository(PriceListDetail::class)->findOneBy([ 'list' => $priceList, + 'commodity' => $data ]); if (!$detail) { $detail = new PriceListDetail; @@ -735,6 +760,29 @@ class CommodityController extends AbstractController 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')] public function app_commodity_pricelist_mod(Provider $provider, Request $request, Access $access, Log $log, EntityManagerInterface $entityManager, $code = 0): JsonResponse { diff --git a/hesabixCore/src/Service/Explore.php b/hesabixCore/src/Service/Explore.php index 6bfb67d..169cdf8 100644 --- a/hesabixCore/src/Service/Explore.php +++ b/hesabixCore/src/Service/Explore.php @@ -31,7 +31,7 @@ class Explore { return [ 'id' => $item->getId(), - 'label' => $item->getLabel() + 'label' => $item->getLabel(), ]; } public static function ExplorePersonType(PersonType $type) @@ -199,7 +199,6 @@ class Explore 'name' => $item->getUnit()->getName(), 'floatNumber' => $item->getUnit()->getFloatNumber(), ], - 'prices'=>self::ExploreCommodityPriceListDetails($item->getPriceListDetails()) ]; if($des){ $result['des'] = $des;} return $result;