From c7a44d6f65dd06308501db687a7cb06e65b903fe Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Mon, 16 Nov 2020 09:11:30 +0100 Subject: [PATCH] + Timezone of dates is now providing by user --- database/DataBaseConnector.php | 2 +- database/Requester.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/database/DataBaseConnector.php b/database/DataBaseConnector.php index 66960a4..4843268 100644 --- a/database/DataBaseConnector.php +++ b/database/DataBaseConnector.php @@ -761,7 +761,7 @@ na.id as networkAgentId, $q = mysqli_query($this->con, "INSERT INTO demandeCredits(network_agent_id,montant,status,date_creation) VALUES('$idag','$montant','0','$datetime')"); $id = mysqli_insert_id($this->con); if ($q) { - return ['success' => 1, "agent" => $agent, "id" => $id, + return ['success' => 1, "agent" => $agent, "id" => $id, "datetime" => $datetime, "currency_code" => $agent['currency_code'], "agent_name" => $agent['lastname'].' '.$agent['firstname']]; } } diff --git a/database/Requester.php b/database/Requester.php index 6c73d02..0e35ff0 100644 --- a/database/Requester.php +++ b/database/Requester.php @@ -596,7 +596,7 @@ class Requester * @param $message * @param null $data */ - public function sendPushNotificationToAgent($agent_code, $message, $data = null) + public function sendPushNotificationToAgent($agent_code, $message, $data = null , $date = null) { $client = new \GuzzleHttp\Client([ 'base_uri' => NOTIFICATION_SERVICE_URL, @@ -608,6 +608,7 @@ class Requester $body->agent_code = $agent_code; $body->message = $message; $body->data = $data; + $body->date = $date; $promise = $client->requestAsync('POST', '/onesignal/pushToAgent', ['json' => $body, 'headers' => $headers])->then(); $promise->wait(); } @@ -659,7 +660,7 @@ class Requester $data->data->firstname = $usr['firstname'] ; $data->data->lastname = $usr['lastname']; $this->sendPushNotificationToAgent($codeParrain, - sprintf($this->messageText['NOTIFICATION_CREDIT_DEMAND_TEXT_SUCCESS'],$result['agent_name'],$montant,$result['currency_code']),$data); + sprintf($this->messageText['NOTIFICATION_CREDIT_DEMAND_TEXT_SUCCESS'],$result['agent_name'],$montant,$result['currency_code']),$data,$result['datetime']); }catch (Exception $e){ return json_encode(error_get_last()); }