diff --git a/config/acl.yaml b/config/acl.yaml index 21f09775..c6ccc243 100644 --- a/config/acl.yaml +++ b/config/acl.yaml @@ -215,6 +215,20 @@ access_keys: - id: rider.delete label: Delete + - id: servicecharge + label: Service Charge + acls: + - id: service_charge.menu + label: Menu + - id: service_charge.list + label: List + - id: service_charge.add + label: Add + - id: service_charge.update + label: Update + - id: service_charge.delete + label: Delete + - id: joborder label: Job Order acls: diff --git a/config/cmb.menu.yaml b/config/cmb.menu.yaml index c209ba0c..7c6b4d82 100644 --- a/config/cmb.menu.yaml +++ b/config/cmb.menu.yaml @@ -37,6 +37,10 @@ main_menu: acl: rider.list label: Riders parent: logistics + - id: service_charge_list + acl: service_charge.list + label: Service Charges + parent: logistics - id: battery acl: battery.menu diff --git a/config/menu.yaml b/config/menu.yaml index c209ba0c..7c6b4d82 100644 --- a/config/menu.yaml +++ b/config/menu.yaml @@ -37,6 +37,10 @@ main_menu: acl: rider.list label: Riders parent: logistics + - id: service_charge_list + acl: service_charge.list + label: Service Charges + parent: logistics - id: battery acl: battery.menu diff --git a/config/routes/service_charge.yaml b/config/routes/service_charge.yaml new file mode 100644 index 00000000..c6206371 --- /dev/null +++ b/config/routes/service_charge.yaml @@ -0,0 +1,34 @@ +service_charge_list: + path: /service_charges + controller: App\Controller\ServiceChargeController::index + +service_charge_rows: + path: /service_charges/rows + controller: App\Controller\ServiceChargeController::rows + methods: [POST] + +service_charge_create: + path: /service_charges/create + controller: App\Controller\ServiceChargeController::addForm + methods: [GET] + +service_charge_create_submit: + path: /service_charges/create + controller: App\Controller\ServiceChargeController::addSubmit + methods: [POST] + +service_charge_update: + path: /service_charges/{id} + controller: App\Controller\ServiceChargeController::updateForm + methods: [GET] + +service_charge_update_submit: + path: /service_charges/{id} + controller: App\Controller\ServiceChargeController::updateSubmit + methods: [POST] + +service_charge_delete: + path: /service_charges/{id} + controller: App\Controller\ServiceChargeController::destroy + methods: [DELETE] + diff --git a/src/Controller/ServiceChargeController.php b/src/Controller/ServiceChargeController.php new file mode 100644 index 00000000..7208e306 --- /dev/null +++ b/src/Controller/ServiceChargeController.php @@ -0,0 +1,268 @@ +denyAccessUnlessGranted('service_charge.list', null, 'No access.'); + + return $this->render('service-charge/list.html.twig'); + } + + public function rows(Request $req) + { + $this->denyAccessUnlessGranted('service_charge.list', null, 'No access.'); + + // build query + $qb = $this->getDoctrine() + ->getRepository(ServiceCharge::class) + ->createQueryBuilder('q'); + + // get datatable params + $datatable = $req->request->get('datatable'); + + // count total records + $tquery = $qb->select('COUNT(q)'); + + // add fitlers to count query + $this->setQueryFilters($datatable, $tquery); + + $total = $tquery->getQuery() + ->getSingleScalarResult(); + + // get current page number + $page = $datatable['pagination']['page'] ?? 1; + + $perpage = $datatable['pagination']['perpage']; + $offset = ($page - 1) * $perpage; + + // add metadata + $meta = [ + 'page' => $page, + 'perpage' => $perpage, + 'pages' => ceil($total / $perpage), + 'total' => $total, + 'sort' => 'asc', + 'field' => 'id' + ]; + + // build query + $query = $qb->select('q'); + + // add filters to query + $this->setQueryFilters($datatable, $query); + + // check if sorting is present, otherwise use default + if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) { + $order = $datatable['sort']['sort'] ?? 'asc'; + $query->orderBy('q.' . $datatable['sort']['field'], $order); + } else { + $query->orderBy('q.id', 'asc'); + } + + // get rows for this page + $obj_rows = $query->setFirstResult($offset) + ->setMaxResults($perpage) + ->getQuery() + ->getResult(); + + // process rows + $rows = []; + foreach ($obj_rows as $orow) { + // add row data + $row['id'] = $orow->getID(); + $row['name'] = $orow->getName(); + + // add row metadata + $row['meta'] = [ + 'update_url' => '', + 'delete_url' => '' + ]; + + // add crud urls + if ($this->isGranted('service_charge.update')) + $row['meta']['update_url'] = $this->generateUrl('service_charge_update', ['id' => $row['id']]); + if ($this->isGranted('service.delete')) + $row['meta']['delete_url'] = $this->generateUrl('service_charge_delete', ['id' => $row['id']]); + + $rows[] = $row; + } + + // response + return $this->json([ + 'meta' => $meta, + 'data' => $rows + ]); + } + + /** + * @Menu(selected="service_charge_list") + */ + public function addForm() + { + $this->denyAccessUnlessGranted('service_charge.add', null, 'No access.'); + + $params = []; + $params['obj'] = new ServiceCharge(); + $params['mode'] = 'create'; + + // response + return $this->render('service-charge/form.html.twig', $params); + } + + public function addSubmit(Request $req, ValidatorInterface $validator, EntityManagerInterface $em) + { + $this->denyAccessUnlessGranted('service_charge.add', null, 'No access.'); + + // create new object + $row = new ServiceCharge(); + + // set and save values + $row->setName($req->request->get('name')); + $row->setAmount($req->request->get('amount')); + + // validate + $errors = $validator->validate($row); + + // initialize error list + $error_array = []; + + // add errors to list + foreach ($errors as $error) { + $error_array[$error->getPropertyPath()] = $error->getMessage(); + } + + // check if any errors were found + if (!empty($error_array)) { + // return validation failure response + return $this->json([ + 'success' => false, + 'errors' => $error_array + ], 422); + } else { + // validated! save the entity + $em->persist($row); + $em->flush(); + + // return successful response + return $this->json([ + 'success' => 'Changes have been saved!' + ]); + } + } + + /** + * @Menu(selected="service_charge_list") + * @ParamConverter("sc", class="App\Entity\ServiceCharge") + */ + public function updateForm(ServiceCharge $sc) + { + $this->denyAccessUnlessGranted('service_charge.update', null, 'No access.'); + + $params = []; + $params['mode'] = 'update'; + + if ($sc == null) + throw $this->createNotFoundException('The item does not exist'); + + $params['obj'] = $sc; + + // response + return $this->render('service-charge/form.html.twig', $params); + } + + /** + * @ParamConverter("sc", class="App\Entity\ServiceCharge") + */ + public function updateSubmit(Request $req, ValidatorInterface $validator, + ServiceCharge $sc, EntityManagerInterface $em) + { + $this->denyAccessUnlessGranted('service_charge.update', null, 'No access.'); + + // make sure this row exists + if ($sc == null) + throw $this->createNotFoundException('The item does not exist'); + + // set and save values + $sc->setName($req->request->get('name')); + $sc->setAmount($req->request->get('amount')); + + // validate + $errors = $validator->validate($sc); + + // initialize error list + $error_array = []; + + // add errors to list + foreach ($errors as $error) { + $error_array[$error->getPropertyPath()] = $error->getMessage(); + } + + // check if any errors were found + if (!empty($error_array)) { + // return validation failure response + return $this->json([ + 'success' => false, + 'errors' => $error_array + ], 422); + } else { + // validated! save the entity + $em->flush(); + + // return successful response + return $this->json([ + 'success' => 'Changes have been saved!' + ]); + } + } + + /** + * @Menu(selected="service_list") + * @ParamConverter("sc", class="App\Entity\ServiceCharge") + */ + public function destroy(ServiceCharge $sc, EntityManagerInterface $em) + { + $this->denyAccessUnlessGranted('service_charge.delete', null, 'No access.'); + + $params = []; + + if ($sc == null) + throw $this->createNotFoundException('The item does not exist'); + + // delete this row + $em->remove($sc); + $em->flush(); + + // response + $response = new Response(); + $response->setStatusCode(Response::HTTP_OK); + $response->send(); + } + + protected function setQueryFilters($datatable, &$query) + { + if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) { + $query->where('q.name LIKE :filter') + ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%'); + } + } + +} diff --git a/src/Entity/ServiceCharge.php b/src/Entity/ServiceCharge.php index 8ba224cf..98f96c77 100644 --- a/src/Entity/ServiceCharge.php +++ b/src/Entity/ServiceCharge.php @@ -3,6 +3,7 @@ namespace App\Entity; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Validator\Constraints as Assert; /** * @ORM\Entity @@ -21,6 +22,7 @@ class ServiceCharge // name /** * @ORM\Column(type="string", length=80) + * @Assert\NotBlank() */ protected $name; diff --git a/templates/service-charge/form.html.twig b/templates/service-charge/form.html.twig new file mode 100644 index 00000000..73b5750a --- /dev/null +++ b/templates/service-charge/form.html.twig @@ -0,0 +1,143 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

Service Charges

+
+
+
+ +
+ +
+
+
+
+
+
+ + + +

+ {% if mode == 'update' %} + Edit Service Charge + {{ obj.getID() }} + {% else %} + New Service Charge + {% endif %} +

+
+
+
+
+
+
+
+ + + +
+
+
+
+ + + +
+
+ +
+
+
+
+
+ + Back +
+
+
+
+
+
+
+
+
+{% endblock %} + +{% block scripts %} + +{% endblock %} diff --git a/templates/service-charge/list.html.twig b/templates/service-charge/list.html.twig new file mode 100644 index 00000000..6f92e838 --- /dev/null +++ b/templates/service-charge/list.html.twig @@ -0,0 +1,142 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

+ Service Charges +

+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+ + + + +
+
+
+
+
+ + + + New Service Charge + + +
+
+
+
+ +
+ +
+
+
+
+
+{% endblock %} + +{% block scripts %} + +{% endblock %}