bug fix in create business
This commit is contained in:
parent
5343345f15
commit
5dd4818f63
|
@ -197,11 +197,15 @@ class BusinessController extends AbstractController
|
|||
if ($params['profitCalcType'] == 'lis' || $params['profitCalcType'] == 'avgis') {
|
||||
$business->setProfitCalcType($params['profitCalcType']);
|
||||
}
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
$business->setProfitCalcType('lis');
|
||||
}
|
||||
if (array_key_exists('commodityUpdateSellPriceAuto', $params)) {
|
||||
$business->setCommodityUpdateSellPriceAuto($params['commodityUpdateSellPriceAuto']);
|
||||
}
|
||||
else{
|
||||
$business->setCommodityUpdateSellPriceAuto(true);
|
||||
}
|
||||
if (array_key_exists('walletEnabled', $params)) {
|
||||
if ($params['walletEnabled']) {
|
||||
if (array_key_exists('walletMatchBank', $params)) {
|
||||
|
|
|
@ -34,17 +34,17 @@ class UiGeneralController extends AbstractController
|
|||
$lastBusiness = $entityManager->getRepository(Business::class)->findLast();
|
||||
if($lastBusiness)
|
||||
return $this->render('general/home.html.twig',[
|
||||
'business' => $busCount + 11405,
|
||||
'users' => $users + 29471,
|
||||
'docs' => $docs + 105412,
|
||||
'business' => $busCount,
|
||||
'users' => $users,
|
||||
'docs' => $docs,
|
||||
'lastBusinessName' => $lastBusiness->getname(),
|
||||
'lastBusinessOwner' => $lastBusiness->getOwner()->getFullName(),
|
||||
'blogPosts'=> $entityManager->getRepository(BlogPost::class)->findBy([],['dateSubmit'=>'DESC'],3)
|
||||
]);
|
||||
return $this->render('general/home.html.twig',[
|
||||
'business' => $busCount + 11405,
|
||||
'users' => $users + 29471,
|
||||
'docs' => $docs + 105412,
|
||||
'business' => $busCount,
|
||||
'users' => $users,
|
||||
'docs' => $docs,
|
||||
'lastBusinessName' => 'ثبت نشده',
|
||||
'lastBusinessOwner' => 'ثبت نشده',
|
||||
'blogPosts'=> $entityManager->getRepository(BlogPost::class)->findBy([],['dateSubmit'=>'DESC'],3)
|
||||
|
|
|
@ -382,7 +382,6 @@ class HesabdariController extends AbstractController
|
|||
'id' => $row['chequeOwner']
|
||||
]);
|
||||
$cheque = new Cheque();
|
||||
echo $hesabdariRow->getRef();
|
||||
$cheque->setBid($acc['bid']);
|
||||
$cheque->setSubmitter($this->getUser());
|
||||
$cheque->setPayDate($row['chequeDate']);
|
||||
|
@ -392,7 +391,7 @@ class HesabdariController extends AbstractController
|
|||
$cheque->setSayadNum($row['chequeSayadNum']);
|
||||
$cheque->setDateSubmit(time());
|
||||
$cheque->setDes($row['des']);
|
||||
$dateArray = explode('-', $row['chequeDate']);
|
||||
$dateArray = explode('/', $row['chequeDate']);
|
||||
$dateGre = strtotime($jdate->jalali_to_gregorian($dateArray['0'], $dateArray['1'], $dateArray['2'], '/'));
|
||||
$cheque->setDateStamp($dateGre);
|
||||
$cheque->setPerson($person);
|
||||
|
|
|
@ -76,9 +76,11 @@ class PersonsController extends AbstractController
|
|||
$bs = 0;
|
||||
$bd = 0;
|
||||
foreach ($rows as $row) {
|
||||
if ($row->getDoc()->getMoney() == $acc['money']) {
|
||||
$bs += $row->getBs();
|
||||
$bd += $row->getBd();
|
||||
}
|
||||
}
|
||||
$response['bs'] = $bs;
|
||||
$response['bd'] = $bd;
|
||||
$response['balance'] = $bs - $bd;
|
||||
|
@ -379,14 +381,17 @@ class PersonsController extends AbstractController
|
|||
'mobile' => $person->getMobile()
|
||||
];
|
||||
$rows = $entityManager->getRepository(HesabdariRow::class)->findBy([
|
||||
'person' => $person
|
||||
'person' => $person,
|
||||
]);
|
||||
$bs = 0;
|
||||
$bd = 0;
|
||||
foreach ($rows as $row) {
|
||||
//check for that calulate is in match money type
|
||||
if ($row->getDoc()->getMoney() == $acc['money']) {
|
||||
$bs += $row->getBs();
|
||||
$bd += $row->getBd();
|
||||
}
|
||||
}
|
||||
$temp['bs'] = $bs;
|
||||
$temp['bd'] = $bd;
|
||||
$temp['balance'] = $bs - $bd;
|
||||
|
|
Loading…
Reference in a new issue