diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 3367a365..08a90c5a 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -635,7 +635,7 @@ class APIController extends Controller 'size_id' => $batt->getSize()->getID(), 'size_name' => $batt->getSize()->getName(), 'price' => $batt->getSellingPrice(), - 'wty_personal' => $batt->getWarrantyPersonal(), + 'wty_private' => $batt->getWarrantyPrivate(), 'wty_commercial' => $batt->getWarrantyCommercial(), ]; } diff --git a/src/Controller/BatteryController.php b/src/Controller/BatteryController.php index 9991d5d5..238738f7 100644 --- a/src/Controller/BatteryController.php +++ b/src/Controller/BatteryController.php @@ -116,7 +116,7 @@ class BatteryController extends BaseController $row['size_name'] = $orow['size_name']; $row['prod_code'] = $orow[0]->getProductCode(); $row['sell_price'] = $orow[0]->getSellingPrice(); - $row['warr_personal'] = $orow[0]->getWarrantyPersonal(); + $row['warr_private'] = $orow[0]->getWarrantyPrivate(); $row['warr_commercial'] = $orow[0]->getWarrantyCommercial(); $row['res_capacity'] = $orow[0]->getReserveCapacity(); $row['length'] = $orow[0]->getLength(); @@ -176,7 +176,7 @@ class BatteryController extends BaseController // set and save values $row->setProductCode($req->request->get('prod_code')) - ->setWarrantyPersonal($req->request->get('warr_personal')) + ->setWarrantyPrivate($req->request->get('warr_private')) ->setWarrantyCommercial($req->request->get('warr_commercial')) ->setReserveCapacity($req->request->get('res_capacity')) ->setLength($req->request->get('length')) @@ -296,7 +296,7 @@ class BatteryController extends BaseController // set and save values $row->setProductCode($req->request->get('prod_code')) - ->setWarrantyPersonal($req->request->get('warr_personal')) + ->setWarrantyPrivate($req->request->get('warr_private')) ->setWarrantyCommercial($req->request->get('warr_commercial')) ->setReserveCapacity($req->request->get('res_capacity')) ->setLength($req->request->get('length')) diff --git a/src/Entity/Battery.php b/src/Entity/Battery.php index 87ed9666..c1c95931 100644 --- a/src/Entity/Battery.php +++ b/src/Entity/Battery.php @@ -71,7 +71,7 @@ class Battery * @ORM\Column(type="smallint") * @Assert\NotBlank() */ - protected $warr_personal; + protected $warr_private; // warranty commercial /** @@ -193,15 +193,15 @@ class Battery return $this->prod_code; } - public function setWarrantyPersonal($warr_personal) + public function setWarrantyPrivate($warr_private) { - $this->warr_personal = $warr_personal; + $this->warr_private = $warr_private; return $this; } - public function getWarrantyPersonal() + public function getWarrantyPrivate() { - return $this->warr_personal; + return $this->warr_private; } public function setWarrantyCommercial($warr_commercial) diff --git a/templates/battery/form.html.twig b/templates/battery/form.html.twig index dc7ee01e..51c8cdb8 100644 --- a/templates/battery/form.html.twig +++ b/templates/battery/form.html.twig @@ -114,11 +114,11 @@
-
diff --git a/templates/battery/list.html.twig b/templates/battery/list.html.twig index f0001f4d..71f8f9b0 100644 --- a/templates/battery/list.html.twig +++ b/templates/battery/list.html.twig @@ -104,7 +104,7 @@ width: 150 }, { - field: 'warr_personal', + field: 'warr_private', title: 'Personal Wty.', width: 170 },