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

Add saving of payment methods for hub. Fix issues found with notification number. #554

Browse source
This commit is contained in:
Korina Cordero 2021-04-27 06:16:40 +00:00
parent 12798e00be
commit 0717df5fff
3 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Controller/HubController.php
View file

@ -148,8 +148,6 @@ class HubController extends Controller
$time_open = DateTime::createFromFormat($format, $req->request->get('time_open'));
$time_close = DateTime::createFromFormat($format, $req->request->get('time_close'));
error_log($req->request->get('notif_number'));
// set and save values
$obj->setName($req->request->get('name'))
->setBranch($req->request->get('branch'))
@ -162,7 +160,16 @@ class HubController extends Controller
->setStatusOpen($req->request->get('status_open', false))
->setRiderSlots($req->request->get('rider_slots', 0))
->setHubViewFlag($req->request->get('flag_hub_view', false))
->setNotifNumber('63' . $req->request->get('notif_number'));
->setNotifNumber($req->request->get('notif_number'))
->clearPaymentMethods();
// set payment methods
$payment_methods = $req->request->get('payment_methods');
if (!empty($payment_methods))
{
$obj->setPaymentMethods($payment_methods);
}
}
protected function setQueryFilters($datatable, QueryBuilder $query)
@ -189,9 +196,12 @@ class HubController extends Controller
// validate the notification number
$mobile = $req->request->get('notif_number');
$is_valid = $rt->validatePhoneNumber($mobile);
if (!$is_valid)
$error_array['notif_number'] = 'Invalid notification number';
if (!empty($mobile))
{
$is_valid = $rt->validatePhoneNumber($mobile);
if (!$is_valid)
$error_array['notif_number'] = 'Invalid notification number';
}
$this->setObject($obj, $req);
@ -263,9 +273,12 @@ class HubController extends Controller
// validate the notification number
$mobile = $req->request->get('notif_number');
$is_valid = $rt->validatePhoneNumber($mobile);
if (!$is_valid)
$error_array['notif_number'] = 'Invalid notification number';
if (!empty($mobile))
{
$is_valid = $rt->validatePhoneNumber($mobile);
if (!$is_valid)
$error_array['notif_number'] = 'Invalid notification number';
}
$this->setObject($obj, $req);

5
src/Service/HubSelector.php
View file

@ -275,11 +275,12 @@ class HubSelector
$message = str_replace('item_display', trim($sku_text), $this->trans->trans('no_inventory_message'));
// get hub notification number
$mobile_number = $hub->getNotifNumber();
$number = $hub->getNotifNumber();
if (!empty($mobile_number))
if (!empty($number))
{
// send SMS message
$mobile_number = '63' . $number;
error_log('sending sms to - ' . $mobile_number);
$this->rt->sendSMS($mobile_number, 'MOTOLITE', $message);
}

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

@ -158,10 +158,10 @@
<div class="col-lg-6">
<label data-field="payment_method">Payment Methods</label>
<div class="m-checkbox-list">
{% for payment_method in payment_methods %}
{% for key, value in payment_methods %}
<label class="m-checkbox">
<input type="checkbox" name="payment_methods[]" value="{{ payment_method }}"{{ payment_method in obj.getPaymentMethods ? ' checked' : '' }}>
{{ payment_method }}
<input type="checkbox" name="payment_methods[]" value="{{ key }}"{{ key in obj.getPaymentMethods ? ' checked' : '' }}>
{{ value }}
<span></span>
</label>
{% endfor %}