Merge branch '77-uat-bug-fixing' into 'master'

Resolve "UAT Bug fixing"

Closes #77

See merge request jankstudio/resq!64
This commit is contained in:
Kendrick Chan 2018-04-06 09:50:59 +00:00
commit 13ba67700f
2 changed files with 3 additions and 3 deletions

View file

@ -128,9 +128,9 @@ class CustomerController extends BaseController
];
// add crud urls
if ($this->isGranted('user.update'))
if ($this->isGranted('customer.update'))
$row['meta']['update_url'] = $this->generateUrl('customer_update', ['id' => $row['id']]);
if ($this->isGranted('user.delete'))
if ($this->isGranted('customer.delete'))
$row['meta']['delete_url'] = $this->generateUrl('customer_delete', ['id' => $row['id']]);
$rows[] = $row;

View file

@ -114,7 +114,7 @@
<div class="col-lg-4">
<label>&nbsp;</label>
<div>
<a href="{{ url('jo_proc_form', {'id': job_order.getID }) }}" class="btn btn-info">View Job Order</a>
<a href="{{ url('jo_all_form', {'id': job_order.getID }) }}" class="btn btn-info">View Job Order</a>
</div>
</div>
{% endif %}