Merge branch '508-cmb-remove-tier-2-notes-from-form' into '488-cmb-live'
Resolve "CMB - remove tier 2 notes from form" See merge request jankstudio/resq!590
This commit is contained in:
Korina Cordero
commit
18a2be4aa9
3 changed files with 0 additions and 40 deletions
|
|
@ -371,8 +371,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setSource($req->request->get('source'))
|
||||
->setStatus(JOStatus::PENDING)
|
||||
->setDeliveryInstructions($req->request->get('delivery_instructions'))
|
||||
->setTier1Notes($req->request->get('tier1_notes'))
|
||||
->setTier2Notes($req->request->get('tier2_notes'))
|
||||
->setDeliveryAddress($req->request->get('delivery_address'))
|
||||
->setORName($req->request->get('or_name'))
|
||||
->setPromoDetail($req->request->get('promo_detail', ''))
|
||||
|
|
@ -633,8 +631,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setWarrantyClass($req->request->get('warranty_class'))
|
||||
->setSource($req->request->get('source'))
|
||||
->setDeliveryInstructions($req->request->get('delivery_instructions'))
|
||||
->setTier1Notes($req->request->get('tier1_notes'))
|
||||
->setTier2Notes($req->request->get('tier2_notes'))
|
||||
->setDeliveryAddress($req->request->get('delivery_address'))
|
||||
->setORName($req->request->get('or_name'))
|
||||
->setPromoDetail($req->request->get('promo_detail', ''))
|
||||
|
|
@ -837,8 +833,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setSource($req->request->get('source'))
|
||||
->setStatus(JOStatus::RIDER_ASSIGN)
|
||||
->setDeliveryInstructions($req->request->get('delivery_instructions'))
|
||||
->setTier1Notes($req->request->get('tier1_notes'))
|
||||
->setTier2Notes($req->request->get('tier2_notes'))
|
||||
->setDeliveryAddress($req->request->get('delivery_address'))
|
||||
->setFacilitatedType($fac_type)
|
||||
->setFacilitatedBy($fac_by)
|
||||
|
|
@ -932,8 +926,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setSource($req->request->get('source'))
|
||||
->setStatus(JOStatus::ASSIGNED)
|
||||
->setDeliveryInstructions($req->request->get('delivery_instructions'))
|
||||
->setTier1Notes($req->request->get('tier1_notes'))
|
||||
->setTier2Notes($req->request->get('tier2_notes'))
|
||||
->setDeliveryAddress($req->request->get('delivery_address'))
|
||||
->setDateAssign(new DateTime())
|
||||
->setRider($rider);
|
||||
|
|
@ -1008,8 +1000,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setWarrantyClass($req->request->get('warranty_class'))
|
||||
->setSource($req->request->get('source'))
|
||||
->setDeliveryInstructions($req->request->get('delivery_instructions'))
|
||||
->setTier1Notes($req->request->get('tier1_notes'))
|
||||
->setTier2Notes($req->request->get('tier2_notes'))
|
||||
->setDeliveryAddress($req->request->get('delivery_address'));
|
||||
|
||||
// validate
|
||||
|
|
@ -1223,8 +1213,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setSource($req->request->get('source'))
|
||||
->setStatus(JOStatus::RIDER_ASSIGN)
|
||||
->setDeliveryInstructions($req->request->get('delivery_instructions'))
|
||||
->setTier1Notes($req->request->get('tier1_notes'))
|
||||
->setTier2Notes($req->request->get('tier2_notes'))
|
||||
->setDeliveryAddress($req->request->get('delivery_address'))
|
||||
->setHub($hub)
|
||||
->clearRider();
|
||||
|
|
@ -1423,8 +1411,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setSource($req->request->get('source'))
|
||||
->setStatus(JOStatus::ASSIGNED)
|
||||
->setDeliveryInstructions($req->request->get('delivery_instructions'))
|
||||
->setTier1Notes($req->request->get('tier1_notes'))
|
||||
->setTier2Notes($req->request->get('tier2_notes'))
|
||||
->setDeliveryAddress($req->request->get('delivery_address'))
|
||||
->setDateAssign(new DateTime())
|
||||
->setRider($rider);
|
||||
|
|
@ -2746,8 +2732,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setWarrantyClass($req->request->get('warranty_class'))
|
||||
->setSource($req->request->get('source'))
|
||||
->setStatus(JOStatus::FULFILLED)
|
||||
->setTier1Notes($req->request->get('tier1_notes'))
|
||||
->setTier2Notes($req->request->get('tier2_notes'))
|
||||
->setORName($req->request->get('or_name'))
|
||||
->setPromoDetail($req->request->get('promo_detail', ''))
|
||||
->setModeOfPayment($req->request->get('mode_of_payment'))
|
||||
|
|
|
|||
|
|
@ -305,18 +305,6 @@
|
|||
<div class="form-control-feedback hide" data-field="date_schedule_time"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="col-lg-6">
|
||||
<label data-field="tier1_notes">Tier 1 Notes</label>
|
||||
<textarea name="tier1_notes" class="form-control m-input" rows="15">{{ obj.getTier1Notes }}</textarea>
|
||||
<div class="form-control-feedback hide" data-field="tier1_notes"></div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<label data-field="tier2_notes">Tier 2 Notes</label>
|
||||
<textarea name="tier2_notes" class="form-control m-input" rows="15">{{ obj.getTier2Notes }}</textarea>
|
||||
<div class="form-control-feedback hide" data-field="tier2_notes"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="col-lg-6">
|
||||
<div class="col-lg-12 form-group-inner">
|
||||
|
|
|
|||
|
|
@ -305,18 +305,6 @@
|
|||
<div class="form-control-feedback hide" data-field="date_schedule_time"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="col-lg-6">
|
||||
<label data-field="tier1_notes">Tier 1 Notes</label>
|
||||
<textarea name="tier1_notes" class="form-control m-input" rows="15">{{ obj.getTier1Notes }}</textarea>
|
||||
<div class="form-control-feedback hide" data-field="tier1_notes"></div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<label data-field="tier2_notes">Tier 2 Notes</label>
|
||||
<textarea name="tier2_notes" class="form-control m-input" rows="15">{{ obj.getTier2Notes }}</textarea>
|
||||
<div class="form-control-feedback hide" data-field="tier2_notes"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="col-lg-6">
|
||||
<div class="col-lg-12 form-group-inner">
|
||||
|
|
|
|||
Loading…
Reference in a new issue