Add checking for empty sku. #551

src/Controller/APIController.php

@@ -2905,6 +2905,10 @@ class APIController extends Controller implements LoggedController
         }
 
         $sku = $warr_serial->getSKU();
+
+        // check if sku is null
+        $batt = null;
+        if ($sku != null)
             $batt = $em->getRepository(SAPBattery::class)->find($sku);
         // TODO: put this in a config file
         $image_url = $req->getSchemeAndHttpHost() . '/battery/generic.png';
@@ -3060,15 +3064,12 @@ class APIController extends Controller implements LoggedController
             $sms_msg = $trans->trans('warranty_register_confirm');
         }
 
+        // check if sku is null
         // get sap battery
         $sku = $warr_serial->getSKU();
+        $sap_bty = null;
+        if ($sku != null)
             $sap_bty = $em->getRepository(SAPBattery::class)->find($sku);
-        if ($sap_bty == null)
-        {
-            $res->setError(true)
-                ->setErrorMessage('Could not find battery entry for warranty.');
-            return $res;
-        }
 
         // default date purchase to today
         // NOTE: might need to change this later

src/Controller/CAPI/CustomerWarrantyController.php

@@ -381,10 +381,16 @@ class CustomerWarrantyController extends APIController
         error_log('sap battery check');
         // get sap battery
         $sku = $warr_serial->getSKU();
-        $sap_bty = $em->getRepository(SAPBattery::class)->find($sku);
+        $sap_bty = null;
-        if ($sap_bty == null)
+
+        // check if sku is null
+        if ($sku != null)
         {
-			return new APIResponse(false, 'Could not find battery entry for warranty.');
+            $sap_bty = $em->getRepository(SAPBattery::class)->find($sku);
+            //if ($sap_bty == null)
+            //{
+            //    return new APIResponse(false, 'Could not find battery entry for warranty.');
+            //}
         }
 
         // vehicle fetch

src/Controller/CAPI/WarrantyController.php

@@ -199,10 +199,16 @@ class WarrantyController extends APIController
         if (!$plate)
             return new APIResponse(false, 'Invalid plate number.');
 
+        // check if sku is blank
+        if ((empty($sku)) || ($sku == null))
+            $batt = null;
+        else
+        {
             // battery
             $batt = $em->getRepository(SAPBattery::class)->find($sku);
             if ($batt == null)
                 return new APIResponse(false, 'Invalid battery SKU.');
+        }
 
         /*
         // battery model
@@ -382,10 +388,16 @@ class WarrantyController extends APIController
         if (!$plate)
             return new APIResponse(false, 'Invalid plate number.');
 
+        // check if sku is blank
+        if ((empty($sku)) || ($sku == null))
+            $batt = null;
+        else
+        {
             // battery
             $batt = $em->getRepository(SAPBattery::class)->find($sku);
             if ($batt == null)
                 return new APIResponse(false, 'Invalid battery SKU.');
+        }
 
         $warr->setSerial($serial)
             ->setWarrantyClass($warr_class)

src/Controller/WarrantyController.php

@@ -181,6 +181,10 @@ class WarrantyController extends Controller
         }
 
         // custom validation for battery model
+        // check if battery model is blank
+        $bmodel = $req->request->get('battery_model');
+        if (!empty($bmodel))
+        {
             $model = $em->getRepository(BatteryModel::class)
                 ->find($req->request->get('battery_model'));
 
@@ -188,8 +192,15 @@ class WarrantyController extends Controller
                 $error_array['battery_model'] = 'Invalid model selected.';
             else
                 $obj->setBatteryModel($model);
+        }
+        else
+            $obj->setBatteryModel(null);
 
         // custom validation for battery size
+        // check if battery size is blank
+        $bsize = $req->request->get('battery_size');
+        if (!empty($bsize))
+        {
             $size = $em->getRepository(BatterySize::class)
                 ->find($req->request->get('battery_size'));
 
@@ -197,8 +208,15 @@ class WarrantyController extends Controller
                 $error_array['battery_size'] = 'Invalid size selected.';
             else
                 $obj->setBatterySize($size);
+        }
+        else
+            $obj->setBatterySize(null);
 
         // custom validation for SAP battery
+        // check if sap battery is blank
+        $sap_battery = $req->request->get('sap_battery');
+        if (!empty($sap_battery))
+        {
             $sap = $em->getRepository(SAPBattery::class)
                 ->find($req->request->get('sap_battery'));
 
@@ -206,6 +224,9 @@ class WarrantyController extends Controller
                 $error_array['sap_battery'] = 'Invalid SAP battery selected.';
             else
                 $obj->setSAPBattery($sap);
+        }
+        else
+            $obj->setSAPBattery(null);
 
         // validate
         $errors = $validator->validate($obj);
@@ -303,6 +324,10 @@ class WarrantyController extends Controller
         }
 
         // custom validation for battery model
+        // check if battery model is blank
+        $bmodel = $req->request->get('battery_model');
+        if (!empty($bmodel))
+        {
             $model = $em->getRepository(BatteryModel::class)
                 ->find($req->request->get('battery_model'));
 
@@ -310,8 +335,15 @@ class WarrantyController extends Controller
                 $error_array['battery_model'] = 'Invalid model selected.';
             else
                 $obj->setBatteryModel($model);
+        }
+        else
+            $obj->setBatteryModel(null);
 
         // custom validation for battery size
+        // check if battery size is blank
+        $bsize = $req->request->get('battery_size');
+        if (!empty($bsize))
+        {
             $size = $em->getRepository(BatterySize::class)
                 ->find($req->request->get('battery_size'));
 
@@ -319,8 +351,15 @@ class WarrantyController extends Controller
                 $error_array['battery_size'] = 'Invalid size selected.';
             else
                 $obj->setBatterySize($size);
+        }
+        else
+            $obj->setBatterySize(null);
 
         // custom validation for SAP battery
+        // check if sap battery is blank
+        $sap_battery = $req->request->get('sap_battery');
+        if (!empty($sap_battery))
+        {
             $sap = $em->getRepository(SAPBattery::class)
                 ->find($req->request->get('sap_battery'));
 
@@ -328,6 +367,9 @@ class WarrantyController extends Controller
                 $error_array['sap_battery'] = 'Invalid SAP battery selected.';
             else
                 $obj->setSAPBattery($sap);
+        }
+        else
+            $obj->setSAPBattery(null);
 
         // validate
         $errors = $validator->validate($obj);

templates/warranty/form.html.twig

@@ -98,6 +98,7 @@
                                             SAP Battery
                                         </label>
                                         <select name="sap_battery" class="form-control m-input">
+                                            <option value=""></option>
                                             {% for sap_battery in sap_batts %}
                                                 <option value="{{ sap_battery.getID }}"{{ obj.getSAPBattery.getID|default(0) == sap_battery.getID ? ' selected' }}>{{ sap_battery.getID }}</option>
                                             {% endfor %}
@@ -109,6 +110,7 @@
                                             Battery Model
                                         </label>
                                         <select name="battery_model" class="form-control m-input">
+                                            <option value=""></option>
                                             {% for model in batt_models %}
                                                 <option value="{{ model.getID }}"{{ obj.getBatteryModel.getID|default(0) == model.getID ? ' selected' }}>{{ model.getName }}</option>
                                             {% endfor %}