Add create, update, list, and delete for service charges. #348

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:

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

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

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]
+

src/Controller/ServiceChargeController.php

@@ -0,0 +1,268 @@
+<?php
+
+namespace App\Controller;
+
+use App\Entity\ServiceCharge;
+
+use Doctrine\ORM\Query;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+use Catalyst\MenuBundle\Annotation\Menu;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+
+class ServiceChargeController extends Controller
+{
+    /**
+     * @Menu(selected="service_charge_list")
+     */
+    public function index()
+    {
+        $this->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'] . '%');
+        }
+    }
+
+}

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;
 

templates/service-charge/form.html.twig

@@ -0,0 +1,143 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+	<!-- BEGIN: Subheader -->
+    <div class="m-subheader">
+        <div class="d-flex align-items-center">
+            <div class="mr-auto">
+                <h3 class="m-subheader__title">Service Charges</h3>
+            </div>
+        </div>
+    </div>
+    <!-- END: Subheader -->
+    <div class="m-content">
+        <!--Begin::Section-->
+        <div class="row">
+            <div class="col-xl-8">
+            	<div class="m-portlet m-portlet--mobile">
+                    <div class="m-portlet__head">
+                        <div class="m-portlet__head-caption">
+                            <div class="m-portlet__head-title">
+                                <span class="m-portlet__head-icon">
+                                    <i class="la la-key"></i>
+                                </span>
+                                <h3 class="m-portlet__head-text">
+                                    {% if mode == 'update' %}
+                                        Edit Service Charge
+                                        <small>{{ obj.getID() }}</small>
+                                    {% else %}
+                                        New Service Charge
+                                    {% endif %}
+                                </h3>
+                            </div>
+                        </div>
+                    </div>
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('service_charge_update_submit', {'id': obj.getID()}) : url('service_charge_create_submit') }}">
+                        <div class="m-portlet__body">	
+                            <div class="form-group m-form__group row no-border">
+                                <div class="col-lg-12">
+                                    <label data-field="name">
+                                        Name:
+                                    </label>
+                                    <input type="text" name="name" class="form-control m-input" value="{{ obj.getName() }}">
+                                    <div class="form-control-feedback hide" data-field="name"></div>
+                                </div>
+                            </div>
+                            <div class="form-group m-form__group row no-border">
+                                <div class="col-lg-12">
+                                    <label data-field="amount">
+                                        Amount:
+                                    </label>
+                                    <input type="number" name="amount" class="form-control m-input" value="{{ obj.getAmount() }}">
+                                    <div class="form-control-feedback hide" data-field="amount"></div>
+                                </div>
+                            </div>
+	
+                        </div>
+                        <div class="m-portlet__foot m-portlet__foot--fit">
+                            <div class="m-form__actions m-form__actions--solid m-form__actions--right">
+                                <div class="row">
+                                    <div class="col-lg-12">
+                                        <button type="submit" class="btn btn-success">Submit</button>
+                                            <a href="{{ url('service_charge_list') }}" class="btn btn-secondary">Back</a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+{% block scripts %}
+<script>
+    $(function() {
+        $("#row-form").submit(function(e) {
+            var form = $(this);
+
+            e.preventDefault();
+
+            $.ajax({
+                method: "POST",
+                url: form.prop('action'),
+                data: form.serialize()
+            }).done(function(response) {
+                // remove all error classes
+                removeErrors();
+                swal({
+                    title: 'Done!',
+                    text: 'Your changes have been saved!',
+                    type: 'success',
+                    onClose: function() {
+                        window.location.href = "{{ url('service_charge_list') }}";
+                    }
+                });
+            }).fail(function(response) {
+                if (response.status == 422 || response.status == 403) {
+                    var errors = response.responseJSON.errors;
+                    var firstfield = false;
+
+                    // remove all error classes first
+                    removeErrors();
+
+                    // display errors contextually
+                    $.each(errors, function(field, msg) {
+                        var formfield = $("[name='" + field + "']");
+                        var label = $("label[data-field='" + field + "']");
+                        var msgbox = $(".form-control-feedback[data-field='" + field + "']");
+
+                        // add error classes to bad fields
+                        formfield.addClass('form-control-danger');
+                        label.addClass('has-danger');
+                        msgbox.html(msg).addClass('has-danger').removeClass('hide');
+
+                        // check if this field comes first in DOM
+                        var domfield = formfield.get(0);
+
+                        if (!firstfield || (firstfield && firstfield.compareDocumentPosition(domfield) === 2)) {
+                            firstfield = domfield;
+                        }
+                    });
+
+                    // focus on first bad field
+                    firstfield.focus();
+
+                    // scroll to above that field to make it visible
+                    $('html, body').animate({
+                        scrollTop: $(firstfield).offset().top - 200
+                    }, 100);
+                }
+            });
+        });
+
+        // remove all error classes
+        function removeErrors() {
+            $(".form-control-danger").removeClass('form-control-danger');
+            $("[data-field]").removeClass('has-danger');
+            $(".form-control-feedback[data-field]").addClass('hide');
+        }
+    });
+</script>
+{% endblock %}

templates/service-charge/list.html.twig

@@ -0,0 +1,142 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+    <!-- BEGIN: Subheader -->
+    <div class="m-subheader">
+        <div class="d-flex align-items-center">
+            <div class="mr-auto">
+                <h3 class="m-subheader__title">
+                   Service Charges
+                </h3>
+            </div>
+        </div>
+    </div>
+    <!-- END: Subheader -->
+    <div class="m-content">
+        <!--Begin::Section-->
+        <div class="row">
+            <div class="col-xl-12">
+            	<div class="m-portlet m-portlet--mobile">
+                    <div class="m-portlet__body">
+                    	<div class="m-form m-form--label-align-right m--margin-top-20 m--margin-bottom-30">
+                            <div class="row align-items-center">
+                                <div class="col-xl-8 order-2 order-xl-1">
+                                    <div class="form-group m-form__group row align-items-center">
+                                        <div class="col-md-4">
+                                            <div class="m-input-icon m-input-icon--left">
+                                                <input type="text" class="form-control m-input m-input--solid" placeholder="Search..." id="data-rows-search">
+                                                    <span class="m-input-icon__icon m-input-icon__icon--left">
+                                                        <span><i class="la la-search"></i></span>
+                                                    </span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-xl-4 order-1 order-xl-2 m--align-right">
+                                    <a href="{{ url('service_charge_create') }}" class="btn btn-focus m-btn m-btn--custom m-btn--icon m-btn--air m-btn--pill">
+                                        <span>
+                                            <i class="la la-key"></i>
+                                            <span>New Service Charge</span>
+                                        </span>
+                                    </a>					
+                                    <div class="m-separator m-separator--dashed d-xl-none"></div>
+                                </div>
+                            </div>
+                        </div>
+                        <!--begin: Datatable -->
+                        <div id="data-rows"></div>
+                        <!--end: Datatable -->
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+{% block scripts %}
+<script>
+    $(function() {
+        var options = {
+            data: {
+                type: 'remote',
+                source: {
+                    read: {
+                        url: '{{ url("service_charge_rows") }}',
+                        method: 'POST'
+                    }
+                },
+                saveState: {
+                    cookie: false,
+                    webstorage: false
+                },
+                pageSize: 10,
+                serverPaging: true,
+                serverFiltering: true,
+                serverSorting: true
+            },
+            columns: [
+            {
+                field: 'id',
+                title: 'ID'
+            },
+            {
+                field: 'name',
+                title: 'Name'
+            },
+            {
+                field: 'Actions',
+                width: 110,
+                title: 'Actions',
+                sortable: false,
+                overflow: 'visible',
+                template: function (row, index, datatable) {
+                    var actions = '';
+                            
+                    if (row.meta.update_url != '') {
+                        actions += '<a href="' + row.meta.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" data-id="' + row.name + '" title="Edit"><i class="la la-edit"></i></a>';
+                    }
+
+                    if (row.meta.delete_url != '') {
+                        actions += '<a href="' + row.meta.delete_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-danger m-btn--icon m-btn--icon-only m-btn--pill btn-delete" data-id="' + row.id + '" title="Delete"><i class="la la-trash"></i></a>';
+                    }
+							
+                    return actions;
+                },
+            }
+            ],
+            search: {
+                onEnter: false,
+                input: $('#data-rows-search'),
+                delay: 400
+            }
+        };
+
+        var table = $("#data-rows").mDatatable(options);
+
+        $(document).on('click', '.btn-delete', function(e) {
+            var url = $(this).prop('href');
+            var id = $(this).data('id');
+            var btn = $(this);
+
+            e.preventDefault();
+
+            swal({
+                title: 'Confirmation',
+                html: 'Are you sure you want to delete <strong>' + id + '</strong>?',
+                type: 'warning',
+                showCancelButton: true
+            }).then((result) => {
+                if (result.value) {
+                    $.ajax({
+                        method: "DELETE",
+                        url: url
+                    }).done(function(response) {
+                        table.row(btn.parents('tr')).remove();
+                        table.reload();
+                    });
+                }
+            });
+        });
+    });
+</script>
+{% endblock %}