diff --git a/hesabixCore/src/Controller/Front/UiGeneralController.php b/hesabixCore/src/Controller/Front/UiGeneralController.php
index a41a492..c698a4d 100644
--- a/hesabixCore/src/Controller/Front/UiGeneralController.php
+++ b/hesabixCore/src/Controller/Front/UiGeneralController.php
@@ -136,4 +136,10 @@ class UiGeneralController extends AbstractController
return $this->render('general/woocommerce.html.twig',);
}
+ #[Route('/front/apps/repservice', name: 'general_apps_repservice')]
+ public function general_apps_repservice(EntityManagerInterface $entityManager): Response
+ {
+ return $this->render('general/repservice.html.twig',);
+ }
+
}
diff --git a/hesabixCore/src/Controller/Plugins/PlugRepserviceController.php b/hesabixCore/src/Controller/Plugins/PlugRepserviceController.php
index 10ca85e..d8228c0 100644
--- a/hesabixCore/src/Controller/Plugins/PlugRepserviceController.php
+++ b/hesabixCore/src/Controller/Plugins/PlugRepserviceController.php
@@ -14,6 +14,7 @@ use App\Service\registryMGR;
use App\Entity\PlugRepserviceOrder;
use App\Entity\PlugRepserviceOrderState;
use App\Service\Explore;
+use App\Service\Jdate;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -57,6 +58,8 @@ class PlugRepserviceController extends AbstractController
!array_key_exists('person', $params) ||
!array_key_exists('serial', $params) ||
!array_key_exists('motaleghat', $params) ||
+ !array_key_exists('color', $params) ||
+ !array_key_exists('model', $params) ||
!array_key_exists('date', $params)
)
return $this->json($extractor->paramsNotSend());
@@ -92,6 +95,8 @@ class PlugRepserviceController extends AbstractController
$order->setCommodity($commodity);
$order->setPerson($person);
$order->setDate($params['date']);
+ $order->setModel($params['model']);
+ $order->setColor($params['color']);
$order->setDes($params['des']);
$order->setMotaleghat($params['motaleghat']);
$order->setPelak($params['pelak']);
@@ -131,7 +136,7 @@ class PlugRepserviceController extends AbstractController
}
#[Route('/api/plug/repservice/order/state/change', name: 'app_plug_repservice_order_state_change')]
- public function app_plug_repservice_order_state_change(Provider $provider, registryMGR $registryMGR, SMS $sms, Log $log, EntityManagerInterface $entityManagerInterface, Access $access, Request $request, Extractor $extractor): JsonResponse
+ public function app_plug_repservice_order_state_change(Jdate $jdate,Provider $provider, registryMGR $registryMGR, SMS $sms, Log $log, EntityManagerInterface $entityManagerInterface, Access $access, Request $request, Extractor $extractor): JsonResponse
{
$acc = $access->hasRole('plugRepservice');
if (!$acc)
@@ -163,6 +168,10 @@ class PlugRepserviceController extends AbstractController
return $this->json($extractor->notFound());
}
$order->setState($state);
+ //set dateout if proccess finish
+ if($state->getCode() == 'getback'){
+ $order->setDateOut($jdate->jdate('Y-n-d',time()));
+ }
$entityManagerInterface->persist($order);
$entityManagerInterface->flush();
$log->insert('افزونه تعمیرکاران', ' وضعیت کالا با کد ' . $order->getCode() . ' به ' . $state->getLabel() . ' تغییر یافت. ', $this->getUser(), $acc['bid']->getId());
@@ -214,7 +223,7 @@ class PlugRepserviceController extends AbstractController
$orders = $entityManagerInterface->getRepository(PlugRepserviceOrder::class)->findBy([
'bid' => $acc['bid']
- ]);
+ ],['code'=>'DESC']);
return $this->json($this->ExploreOrders($orders));
}
@@ -229,7 +238,8 @@ class PlugRepserviceController extends AbstractController
foreach ($items as $item) {
$res[] = [
'code' => $item->getCode(),
- 'label' => $item->getLabel()
+ 'label' => $item->getLabel(),
+ 'checked'=>false
];
}
return $this->json($res);
@@ -245,21 +255,8 @@ class PlugRepserviceController extends AbstractController
$item = $entityManager->getRepository(PlugRepserviceOrder::class)->findOneBy(['bid' => $acc['bid'], 'code' => $code]);
if (!$item)
throw $this->createNotFoundException();
- $temp = [
- 'update' => $item->getCode(),
- 'date'=>$item->getDate(),
- 'des'=>$item->getDes(),
- 'person'=>Explore::ExplorePerson($item->getPerson()),
- 'pelak'=>$item->getPelak(),
- 'serial'=>$item->getSerial(),
- 'motaleghat'=>$item->getMotaleghat(),
- 'commodity'=>Explore::ExploreCommodity($item->getCommodity()),
- 'sms'=>true
- ];
- if($item->getPerson()->getMobile() == null || $item->getPerson()->getMobile() == ''){
- $temp['sms'] = false;
- }
- return $this->json($temp);
+
+ return $this->json($this->ExploreOrder($item));
}
#[Route('/api/repservice/order/remove/{code}', name: 'app_plug_repservice_order_remove')]
@@ -282,6 +279,7 @@ class PlugRepserviceController extends AbstractController
{
$temp = [
'id' => $item->getId(),
+ 'update' => $item->getCode(),
'code' => $item->getCode(),
'person' => Explore::ExplorePerson($item->getPerson()),
'commodity' => Explore::ExploreCommodity($item->getCommodity()),
@@ -295,8 +293,14 @@ class PlugRepserviceController extends AbstractController
'code' => $item->getState()->getCode(),
'label' => $item->getState()->getLabel()
],
- 'sms' => true
+ 'dateOut'=>$item->getDateOut(),
+ 'model'=>$item->getModel(),
+ 'color'=>$item->getColor(),
+ 'sms'=>true,
];
+ if($item->getPerson()->getMobile() == null || $item->getPerson()->getMobile() == ''){
+ $temp['sms'] = false;
+ }
return $temp;
}
diff --git a/hesabixCore/src/Entity/PlugRepserviceOrder.php b/hesabixCore/src/Entity/PlugRepserviceOrder.php
index 1629a0c..e1eae3d 100644
--- a/hesabixCore/src/Entity/PlugRepserviceOrder.php
+++ b/hesabixCore/src/Entity/PlugRepserviceOrder.php
@@ -57,6 +57,15 @@ class PlugRepserviceOrder
#[ORM\Column(length: 255, nullable: true)]
private ?string $motaleghat = null;
+ #[ORM\Column(length: 255, nullable: true)]
+ private ?string $model = null;
+
+ #[ORM\Column(length: 255, nullable: true)]
+ private ?string $color = null;
+
+ #[ORM\Column(length: 50, nullable: true)]
+ private ?string $dateOut = null;
+
public function getId(): ?int
{
return $this->id;
@@ -217,4 +226,40 @@ class PlugRepserviceOrder
return $this;
}
+
+ public function getModel(): ?string
+ {
+ return $this->model;
+ }
+
+ public function setModel(?string $model): static
+ {
+ $this->model = $model;
+
+ return $this;
+ }
+
+ public function getColor(): ?string
+ {
+ return $this->color;
+ }
+
+ public function setColor(?string $color): static
+ {
+ $this->color = $color;
+
+ return $this;
+ }
+
+ public function getDateOut(): ?string
+ {
+ return $this->dateOut;
+ }
+
+ public function setDateOut(?string $dateOut): static
+ {
+ $this->dateOut = $dateOut;
+
+ return $this;
+ }
}
diff --git a/hesabixCore/templates/base.html.twig b/hesabixCore/templates/base.html.twig
index 60f66dd..52edaac 100644
--- a/hesabixCore/templates/base.html.twig
+++ b/hesabixCore/templates/base.html.twig
@@ -1,275 +1,317 @@
{% set settings = twigFunctions.systemSettings() %}
-
-
-
-
-
-
-
-
- حسابیکس - {% block title %}{% endblock %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {# Run `composer require symfony/webpack-encore-bundle` to start using Symfony UX #}
- {% block stylesheets %}
- {% endblock %}
-
- {% block javascripts %}
- {% endblock %}
+
+
+
+
+
+
+
+
+ حسابیکس -
+ {% block title %}{% endblock %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {# Run `composer require symfony/webpack-encore-bundle` to start using Symfony UX #}
+ {% block stylesheets %}{% endblock %}
+
+ {% block javascripts %}{% endblock %}
-
-
-
-
-
-
-
-
- {{ settings.scripts | raw }}
-
-
+
+
+
+
+
+
+ {% block body %}{% endblock %}
+
+
+
+
+
+
+
+
+
+
برنامهها و افزونهها
+
+
+
+
+
+
+ {{settings.footerScripts | raw}}
+
+
+
+
+ {{settings.footer | raw}}
+
+
+
+
+
+ {{ settings.scripts | raw }}
+
+