Add landmark field #UAT
This commit is contained in:
parent
98c92c9184
commit
017a8bb30d
3 changed files with 25 additions and 1 deletions
|
|
@ -206,7 +206,8 @@ class JobOrderController extends BaseController
|
||||||
->setTier1Notes($req->request->get('tier1_notes'))
|
->setTier1Notes($req->request->get('tier1_notes'))
|
||||||
->setTier2Notes($req->request->get('tier2_notes'))
|
->setTier2Notes($req->request->get('tier2_notes'))
|
||||||
->setDeliveryAddress($req->request->get('delivery_address'))
|
->setDeliveryAddress($req->request->get('delivery_address'))
|
||||||
->setORName($req->request->get('or_name'));
|
->setORName($req->request->get('or_name'))
|
||||||
|
->setLandmark($req->request->get('landmark'));
|
||||||
|
|
||||||
// check if reference JO is set and validate
|
// check if reference JO is set and validate
|
||||||
if (!empty($req->request->get('ref_jo'))) {
|
if (!empty($req->request->get('ref_jo'))) {
|
||||||
|
|
|
||||||
|
|
@ -168,6 +168,12 @@ class JobOrder
|
||||||
*/
|
*/
|
||||||
protected $delivery_address;
|
protected $delivery_address;
|
||||||
|
|
||||||
|
// landmark
|
||||||
|
/**
|
||||||
|
* @ORM\Column(type="text")
|
||||||
|
*/
|
||||||
|
protected $landmark;
|
||||||
|
|
||||||
// invoice
|
// invoice
|
||||||
/**
|
/**
|
||||||
* @ORM\OneToOne(targetEntity="Invoice", mappedBy="job_order")
|
* @ORM\OneToOne(targetEntity="Invoice", mappedBy="job_order")
|
||||||
|
|
@ -212,6 +218,7 @@ class JobOrder
|
||||||
$this->source = 'mobile';
|
$this->source = 'mobile';
|
||||||
$this->mode_of_payment = ModeOfPayment::CASH;
|
$this->mode_of_payment = ModeOfPayment::CASH;
|
||||||
$this->or_name = '';
|
$this->or_name = '';
|
||||||
|
$this->landmark = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getID()
|
public function getID()
|
||||||
|
|
@ -473,6 +480,17 @@ class JobOrder
|
||||||
return $this->delivery_address;
|
return $this->delivery_address;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function setLandmark($landmark)
|
||||||
|
{
|
||||||
|
$this->landmark = $landmark;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getLandmark()
|
||||||
|
{
|
||||||
|
return $this->landmark;
|
||||||
|
}
|
||||||
|
|
||||||
public function setInvoice(Invoice $invoice)
|
public function setInvoice(Invoice $invoice)
|
||||||
{
|
{
|
||||||
$this->invoice = $invoice;
|
$this->invoice = $invoice;
|
||||||
|
|
|
||||||
|
|
@ -357,6 +357,11 @@
|
||||||
<textarea name="delivery_address" class="form-control m-input" rows="4">{{ obj.getDeliveryAddress }}</textarea>
|
<textarea name="delivery_address" class="form-control m-input" rows="4">{{ obj.getDeliveryAddress }}</textarea>
|
||||||
<div class="form-control-feedback hide" data-field="delivery_address"></div>
|
<div class="form-control-feedback hide" data-field="delivery_address"></div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-lg-6">
|
||||||
|
<label data-field="landmark">Landmark</label>
|
||||||
|
<textarea name="landmark" class="form-control m-input" rows="4">{{ obj.getLandmark|default('') }}</textarea>
|
||||||
|
<div class="form-control-feedback hide" data-field="landmark"></div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group m-form__group row">
|
<div class="form-group m-form__group row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue