Resolve "Add TNV Warranty to Battery" #1048

Merged
korina.cordero merged 2 commits from 203-add-tnv-warranty-to-battery into master 2019-04-11 09:05:22 +00:00
4 changed files with 31 additions and 0 deletions

View file

@ -119,6 +119,7 @@ class BatteryController extends BaseController
$row['sell_price'] = $orow[0]->getSellingPrice(); $row['sell_price'] = $orow[0]->getSellingPrice();
$row['warr_private'] = $orow[0]->getWarrantyPrivate(); $row['warr_private'] = $orow[0]->getWarrantyPrivate();
$row['warr_commercial'] = $orow[0]->getWarrantyCommercial(); $row['warr_commercial'] = $orow[0]->getWarrantyCommercial();
$row['warr_tnv'] = $orow[0]->getWarrantyTnv();
$row['res_capacity'] = $orow[0]->getReserveCapacity(); $row['res_capacity'] = $orow[0]->getReserveCapacity();
$row['length'] = $orow[0]->getLength(); $row['length'] = $orow[0]->getLength();
$row['width'] = $orow[0]->getWidth(); $row['width'] = $orow[0]->getWidth();
@ -181,6 +182,7 @@ class BatteryController extends BaseController
->setSAPCode($req->request->get('sap_code')) ->setSAPCode($req->request->get('sap_code'))
->setWarrantyPrivate($req->request->get('warr_private')) ->setWarrantyPrivate($req->request->get('warr_private'))
->setWarrantyCommercial($req->request->get('warr_commercial')) ->setWarrantyCommercial($req->request->get('warr_commercial'))
->setWarrantyTnv($req->request->get('warr_tnv'))
->setReserveCapacity($req->request->get('res_capacity')) ->setReserveCapacity($req->request->get('res_capacity'))
->setLength($req->request->get('length')) ->setLength($req->request->get('length'))
->setWidth($req->request->get('width')) ->setWidth($req->request->get('width'))
@ -303,6 +305,7 @@ class BatteryController extends BaseController
->setSAPCode($req->request->get('sap_code')) ->setSAPCode($req->request->get('sap_code'))
->setWarrantyPrivate($req->request->get('warr_private')) ->setWarrantyPrivate($req->request->get('warr_private'))
->setWarrantyCommercial($req->request->get('warr_commercial')) ->setWarrantyCommercial($req->request->get('warr_commercial'))
->setWarrantyTnv($req->request->get('warr_tnv'))
->setReserveCapacity($req->request->get('res_capacity')) ->setReserveCapacity($req->request->get('res_capacity'))
->setLength($req->request->get('length')) ->setLength($req->request->get('length'))
->setWidth($req->request->get('width')) ->setWidth($req->request->get('width'))

View file

@ -85,6 +85,13 @@ class Battery
*/ */
protected $warr_commercial; protected $warr_commercial;
// warranty tnv
/**
* @ORM\Column(type="smallint")
* @Assert\NotBlank()
*/
protected $warr_tnv;
// reserve capacity // reserve capacity
/** /**
* @ORM\Column(type="smallint") * @ORM\Column(type="smallint")
@ -248,6 +255,17 @@ class Battery
return $this->warr_commercial; return $this->warr_commercial;
} }
public function setWarrantyTnv($warr_tnv)
{
$this->warr_tnv = $warr_tnv;
return $this;
}
public function getWarrantyTnv()
{
return $this->warr_tnv;
}
public function setReserveCapacity($res_capacity) public function setReserveCapacity($res_capacity)
{ {
$this->res_capacity = $res_capacity; $this->res_capacity = $res_capacity;

View file

@ -157,6 +157,14 @@
<div class="form-control-feedback hide" data-field="warr_commercial"></div> <div class="form-control-feedback hide" data-field="warr_commercial"></div>
<span class="m-form__help">In months</span> <span class="m-form__help">In months</span>
</div> </div>
<div class="col-lg-4">
<label data-field="warr_tnv">
TNV
</label>
<input type="number" name="warr_tnv" class="form-control m-input" value="{{ obj.getWarrantyTnv }}">
<div class="form-control-feedback hide" data-field="warr_tnv"></div>
<span class="m-form__help">In months</span>
</div>
</div> </div>
</div> </div>
<div class="m-form__seperator m-form__seperator--dashed"></div> <div class="m-form__seperator m-form__seperator--dashed"></div>

View file

@ -0,0 +1,2 @@
update battery as batt inner join battery_model as bmodel on batt.model_id = bmodel.id set batt.warr_tnv=12 where bmodel.name='GOLD';