rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Replace warranty personal with warranty private

Browse source
This commit is contained in:
Ramon Gutierrez 2018-01-31 20:25:47 +08:00
parent 4dbdca870b
commit 83cd3a008b
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Controller/APIController.php
View file

@ -635,7 +635,7 @@ class APIController extends Controller
'size_id' => $batt->getSize()->getID(), 'size_id' => $batt->getSize()->getID(),
'size_name' => $batt->getSize()->getName(), 'size_name' => $batt->getSize()->getName(),
'price' => $batt->getSellingPrice(), 'price' => $batt->getSellingPrice(),
'wty_personal' => $batt->getWarrantyPersonal(), 'wty_private' => $batt->getWarrantyPrivate(),
'wty_commercial' => $batt->getWarrantyCommercial(), 'wty_commercial' => $batt->getWarrantyCommercial(),
]; ];
} }

6
src/Controller/BatteryController.php
View file

@ -116,7 +116,7 @@ class BatteryController extends BaseController
$row['size_name'] = $orow['size_name']; $row['size_name'] = $orow['size_name'];
$row['prod_code'] = $orow[0]->getProductCode(); $row['prod_code'] = $orow[0]->getProductCode();
$row['sell_price'] = $orow[0]->getSellingPrice(); $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['warr_commercial'] = $orow[0]->getWarrantyCommercial();
$row['res_capacity'] = $orow[0]->getReserveCapacity(); $row['res_capacity'] = $orow[0]->getReserveCapacity();
$row['length'] = $orow[0]->getLength(); $row['length'] = $orow[0]->getLength();
@ -176,7 +176,7 @@ class BatteryController extends BaseController
// set and save values // set and save values
$row->setProductCode($req->request->get('prod_code')) $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')) ->setWarrantyCommercial($req->request->get('warr_commercial'))
->setReserveCapacity($req->request->get('res_capacity')) ->setReserveCapacity($req->request->get('res_capacity'))
->setLength($req->request->get('length')) ->setLength($req->request->get('length'))
@ -296,7 +296,7 @@ class BatteryController extends BaseController
// set and save values // set and save values
$row->setProductCode($req->request->get('prod_code')) $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')) ->setWarrantyCommercial($req->request->get('warr_commercial'))
->setReserveCapacity($req->request->get('res_capacity')) ->setReserveCapacity($req->request->get('res_capacity'))
->setLength($req->request->get('length')) ->setLength($req->request->get('length'))

10
src/Entity/Battery.php
View file

@ -71,7 +71,7 @@ class Battery
* @ORM\Column(type="smallint") * @ORM\Column(type="smallint")
* @Assert\NotBlank() * @Assert\NotBlank()
*/ */
protected $warr_personal; protected $warr_private;
// warranty commercial // warranty commercial
/** /**
@ -193,15 +193,15 @@ class Battery
return $this->prod_code; 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; return $this;
} }
public function getWarrantyPersonal() public function getWarrantyPrivate()
{ {
return $this->warr_personal; return $this->warr_private;
} }
public function setWarrantyCommercial($warr_commercial) public function setWarrantyCommercial($warr_commercial)

6
templates/battery/form.html.twig
View file

@ -114,11 +114,11 @@
</div> </div>
<div class="form-group m-form__group row"> <div class="form-group m-form__group row">
<div class="col-lg-4"> <div class="col-lg-4">
<label data-field="warr_personal"> <label data-field="warr_private">
Personal Personal
</label> </label>
<input type="number" name="warr_personal" class="form-control m-input" value="{{ obj.getWarrantyPersonal() }}"> <input type="number" name="warr_private" class="form-control m-input" value="{{ obj.getWarrantyPrivate() }}">
<div class="form-control-feedback hide" data-field="warr_personal"></div> <div class="form-control-feedback hide" data-field="warr_private"></div>
<span class="m-form__help">In months</span> <span class="m-form__help">In months</span>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">

2
templates/battery/list.html.twig
View file

@ -104,7 +104,7 @@
width: 150 width: 150
}, },
{ {
field: 'warr_personal', field: 'warr_private',
title: 'Personal Wty.', title: 'Personal Wty.',
width: 170 width: 170
}, },