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

Make contact number nullable on ticket, fix update behavior to retain old name and number values even if customer is associated

Browse source
This commit is contained in:
Ramon Gutierrez 2018-02-02 03:21:14 +08:00
parent 9841d5c215
commit 8ad354c8c3
3 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Controller/TicketController.php
View file

@ -169,11 +169,11 @@ class TicketController extends BaseController
// set autopopulated fields
$first_name = $customer->getFirstName();
$last_name = $customer->getLastName();
$contact_num = false;
$contact_num = '';
$mobile_numbers = $customer->getMobileNumbers();
if (!empty($mobile_numbers)) {
if (count($mobile_numbers) > 0) {
$contact_num = $mobile_numbers[0]->getID();
}
} else {
@ -188,7 +188,7 @@ class TicketController extends BaseController
// get ticket type
$ticket_type = $req->request->get('ticket_type');
$other_ticket_type = false;
$other_ticket_type = '';
if ($ticket_type == TicketType::OTHER) {
$other_ticket_type = $req->request->get('other_ticket_type');
@ -295,16 +295,10 @@ class TicketController extends BaseController
if (empty($customer))
throw $this->createNotFoundException('This customer does not exist');
// set autopopulated fields
$first_name = $customer->getFirstName();
$last_name = $customer->getLastName();
$contact_num = false;
$mobile_numbers = $customer->getMobileNumbers();
if (!empty($mobile_numbers)) {
$contact_num = $mobile_numbers[0]->getID();
}
// set autopopulated fields to remain the same
$first_name = $obj->getFirstName();
$last_name = $obj->getLastName();
$contact_num = $obj->getContactNumber();
} else {
// get values directly from form
$first_name = $req->request->get('first_name');
@ -314,7 +308,7 @@ class TicketController extends BaseController
// get ticket type
$ticket_type = $req->request->get('ticket_type');
$other_ticket_type = false;
$other_ticket_type = '';
if ($ticket_type == TicketType::OTHER) {
$other_ticket_type = $req->request->get('other_ticket_type');

3
src/Entity/Ticket.php
View file

@ -73,8 +73,7 @@ class Ticket
// contact number of ticket owner
/**
* @ORM\Column(type="string", length=20)
* @Assert\NotBlank()
* @ORM\Column(type="string", length=20, nullable=true)
*/
protected $contact_num;

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

@ -40,17 +40,17 @@
<div class="form-group m-form__group row no-border">
<div class="col-lg-4">
<label data-field="first_name">First Name</label>
<input type="text" name="first_name" class="form-control m-input" value="{{ customer ? customer.getFirstName : obj.getFirstName }}"{{ customer ? ' disabled' }}>
<input type="text" name="first_name" class="form-control m-input" value="{{ customer and mode == 'create' ? customer.getFirstName : obj.getFirstName }}"{{ customer ? ' disabled' }}>
<div class="form-control-feedback hide" data-field="first_name"></div>
</div>
<div class="col-lg-4">
<label data-field="last_name">Last Name</label>
<input type="text" name="last_name" class="form-control m-input" value="{{ customer ? customer.getLastName : obj.getLastName }}"{{ customer ? ' disabled' }}>
<input type="text" name="last_name" class="form-control m-input" value="{{ customer and mode == 'create' ? customer.getLastName : obj.getLastName }}"{{ customer ? ' disabled' }}>
<div class="form-control-feedback hide" data-field="last_name"></div>
</div>
<div class="col-lg-4">
<label data-field="contact_num">Contact Number</label>
<input type="text" name="contact_num" class="form-control m-input" value="{{ customer ? customer.getMobileNumbers[0].getID : obj.getContactNumber }}"{{ customer ? ' disabled' }}>
<input type="text" name="contact_num" class="form-control m-input" value="{{ customer and mode == 'create' and customer.getMobileNumbers is not empty ? customer.getMobileNumbers[0].getID : obj.getContactNumber }}"{{ customer ? ' disabled' }}>
<div class="form-control-feedback hide" data-field="contact_num"></div>
</div>
</div>