diff --git a/public/assets/css/style.css b/public/assets/css/style.css index ac0449cf..b0166679 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -150,6 +150,11 @@ span.has-danger, font-weight: normal; } +.m-datatable--error { + font-weight: normal !important; + font-size: 14px !important; +} + @media (min-width: 995px) { .modal-lg { max-width: 1024px; diff --git a/src/Controller/CustomerController.php b/src/Controller/CustomerController.php index 9fd2aa7d..09670f79 100644 --- a/src/Controller/CustomerController.php +++ b/src/Controller/CustomerController.php @@ -196,14 +196,6 @@ class CustomerController extends BaseController ->setDateRegistered($date_reg) ->setCustomer($row); - if (!empty($number->date_confirmed)) { - $date_confirm = DateTime::createFromFormat("d M Y - h:i A", $number->date_confirmed); - $mobile_number->setDateConfirmed($date_confirm) - ->setConfirmed(); - } else { - $mobile_number->setConfirmed(false); - } - $nerrors = $validator->validate($mobile_number); // add errors to list @@ -405,7 +397,7 @@ class CustomerController extends BaseController // add to list of vehicles to keep - $vehicle_ids[$cust_vehicle->getID()] = true; + $vehicle_ids[] = $cust_vehicle->getID(); } // cleanup @@ -413,7 +405,7 @@ class CustomerController extends BaseController $cvs = $cust->getVehicles(); foreach ($cvs as $cv) { - if (!isset($vehicle_ids[$cv->getID()])) + if (!in_array($cv->getID(), $vehicle_ids)) { $cust->removeVehicle($cv); $em->remove($cv); @@ -438,16 +430,6 @@ class CustomerController extends BaseController ->setDateRegistered(DateTime::createFromFormat("d M Y - h:i A", $number->date_registered)) ->setCustomer($cust); - if (!empty($number->date_confirmed)) - { - $mobile_number->setDateConfirmed(DateTime::createFromFormat("d M Y - h:i A", $number->date_confirmed)) - ->setConfirmed(); - } - else - { - $mobile_number->setConfirmed(false); - } - if (!isset($nerror_array[$key])) { $cust->addMobileNumber($mobile_number); @@ -455,7 +437,7 @@ class CustomerController extends BaseController } // add to list of numbers to keep - $number_ids[] = $mobile_number->getID(); + //$number_ids[] = $mobile_number->getID(); } error_log('cleanup'); @@ -467,7 +449,7 @@ class CustomerController extends BaseController { error_log($mn->getID()); error_log(print_r($number_ids, true)); - if (!isset($number_ids[$mn->getID()])) + if (!in_array($mn->getID(), $number_ids)) { error_log('removing ' . $mn->getID()); $cust->removeMobileNumber($mn); diff --git a/src/Entity/MobileNumber.php b/src/Entity/MobileNumber.php index 54f32175..25438305 100644 --- a/src/Entity/MobileNumber.php +++ b/src/Entity/MobileNumber.php @@ -46,12 +46,6 @@ class MobileNumber */ protected $date_registered; - // date confirmed - /** - * @ORM\Column(type="datetime", nullable=true) - */ - protected $date_confirmed; - // is this customer confirmed via sms code already? /** * @ORM\Column(type="boolean") @@ -108,17 +102,6 @@ class MobileNumber return $this->date_registered; } - public function setDateConfirmed(DateTime $date_confirmed) - { - $this->date_confirmed = $date_confirmed; - return $this; - } - - public function getDateConfirmed() - { - return $this->date_confirmed; - } - public function setConfirmed($flag_confirmed = true) { $this->flag_confirmed = $flag_confirmed; diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig index 14138489..ed780c1e 100644 --- a/templates/customer/form.html.twig +++ b/templates/customer/form.html.twig @@ -99,14 +99,6 @@
Use the format 63xxxxxxxxxx -
-
- - - - -
-
@@ -135,7 +127,7 @@ {% if mode == 'update' %}
- +

@@ -523,22 +515,21 @@ {% for number in obj.getMobileNumbers() %} nrow = { id: "{{ number.getID() }}", - date_registered: "{{ number.getDateRegistered()|date('d M Y - h:i A') }}", - date_confirmed: "{{ number.getDateConfirmed()|date('d M Y - h:i A') }}" + date_registered: "{{ number.getDateRegistered()|date('d M Y - h:i A') }}" }; numberRows.push(nrow); numberIds.push("{{ number.getID() }}"); {% endfor %} - {% for cv in obj.getVehicles() %} + {% for key, cv in obj.getVehicles() %} {% set vehicle = cv.getVehicle() %} {% set battery = cv.getCurrentBattery() %} vrow = { id: "{{ cv.getID() }}", name: "{{ cv.getName() }}", - index: moment().unix(), + index: moment().unix() + {{ key }}, battery: "{{ battery ? battery.getID() }}", battery_label: "{{ battery ? battery.getModel().getName() ~ ' ' ~ battery.getSize().getName() ~ ' (' ~ battery.getProductCode() ~ ')' }}", bmfg: "{{ battery ? battery.getManufacturer().getID() }}", @@ -576,7 +567,6 @@ $("#btn-add-mobile-number").click(function() { var id = $("#mobile-number").val(); var dateRegistered = moment().format("DD MMM YYYY - hh:mm A"); - var dateConfirmed = $("#date-confirmed").val(); var index = $("#vehicle").find(":selected").data('index'); if (!id) { @@ -609,12 +599,11 @@ numberIds.push(id); numberRows.push({ id: id, - date_registered: dateRegistered, - date_confirmed: dateConfirmed + date_registered: dateRegistered }); // clear input fields - $("#mobile-number, #date-confirmed").val(""); + $("#mobile-number").val(""); // refresh the data table numberTable.originalDataSet = numberRows; @@ -939,14 +928,6 @@ return row.date_registered + ''; } }, - { - field: 'date_confirmed', - title: 'Date Confirmed', - width: 200, - template: function (row, index, datatable) { - return row.date_confirmed + ''; - } - }, { field: 'Actions', width: 70,