From 74c2b4be381b91c6ca0ee3ca563147cb059cf690 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sun, 25 Jun 2023 10:21:38 -0400
Subject: [PATCH] notifications

---
 wrenchboard/src/include/wrenchboard_api.h | 1 +
 wrenchboard/src/shared_tool/account.cc    | 6 +++++-
 www-api/app/Config/Constants.php          | 3 ++-
 www-api/app/Controllers/WrenchApi.php     | 2 +-
 www-api/app/Models/ResultFormatter.php    | 3 ++-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h
index 81ab101a..b4a271d6 100644
--- a/wrenchboard/src/include/wrenchboard_api.h
+++ b/wrenchboard/src/include/wrenchboard_api.h
@@ -226,6 +226,7 @@ enum { PARTNER_STRIPE };
 #define WRENCHBOARD_ACCOUNT_COUNTRY_BANKS    11183
 
 #define WRENCHBOARD_ACCOUNT_HOMEBANNERS      11200
+#define WRENCHBOARD_ACCOUNT_NOTIFICATIONS    11205
 
 #define WRENCHBOARD_USER_DELETEACC         11990
 #define WRENCHBOARD_ACCOUNT_END            11999
diff --git a/wrenchboard/src/shared_tool/account.cc b/wrenchboard/src/shared_tool/account.cc
index db359951..267652ce 100644
--- a/wrenchboard/src/shared_tool/account.cc
+++ b/wrenchboard/src/shared_tool/account.cc
@@ -592,7 +592,9 @@ long WrenchBoardMobileSendUserWallet(CVars in, CVars &out) {
          REQ_LONG(in, "member_id", 1, -1);
          out["total_record"] = "0";
         const PGresult *res;
-        res = pgsql_query("SELECT w.amount,c.*,w.amount AS current_balance FROM members_wallet w LEFT JOIN currency c ON c.code=w.currency WHERE w.member_id =%lu ORDER BY c.lorder DESC", in["member_id"].Long());
+        res = pgsql_query("SELECT w.amount,c.*,w.amount AS current_balance,c.country "
+                           "FROM members_wallet w LEFT JOIN currency c ON c.code=w.currency "
+                            "WHERE w.member_id = %lu ORDER BY c.lorder DESC", in["member_id"].Long());
 
         if (res != NULL && pgsql_num_rows(res) > 0) {
             out["total_record"] = pgsql_num_rows(res);
@@ -621,6 +623,8 @@ long WrenchBoardMobileSendUserWallet(CVars in, CVars &out) {
                 snprintf(vname, sizeof (vname), "code_%05d", i);
                 out[vname] = rec["code"];
 
+                snprintf(vname, sizeof (vname), "currency_%05d", i);
+                out[vname] = rec["currency"];
             }
         }
         ret = PHP_API_OK;
diff --git a/www-api/app/Config/Constants.php b/www-api/app/Config/Constants.php
index 0dabed67..b9de9161 100644
--- a/www-api/app/Config/Constants.php
+++ b/www-api/app/Config/Constants.php
@@ -219,7 +219,8 @@ define('WRENCHBOARD_ACCOUNT_JOB_COUNTRY',      11181);
 define('WRENCHBOARD_ACCOUNT_COUNTRY_BANKS',    11183);
 
 
-define('WRENCHBOARD_ACCOUNT_HOMEBANNERS',  11200);
+define('WRENCHBOARD_ACCOUNT_HOMEBANNERS',   11200);
+define('WRENCHBOARD_ACCOUNT_NOTIFICATIONS', 11205);
 
 define('WRENCHBOARD_PICTURE_PROFILE',  11300);
 define('WRENCHBOARD_PICTURE_FAMMEMBER',11305);
diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php
index 377f8fce..f15bcd18 100644
--- a/www-api/app/Controllers/WrenchApi.php
+++ b/www-api/app/Controllers/WrenchApi.php
@@ -123,7 +123,7 @@ class WrenchApi extends BaseController
     private function prepareEndPointData($endpoint, $in, &$call_backend=true,&$local_out=[]){
         switch ($endpoint) {
             case 'mynotifications':
-                $in["action"] =  67989999;
+                $in["action"] =  WRENCHBOARD_ACCOUNT_NOTIFICATIONS;
                 break;
             case 'payprevcard':
                 $in["action"] =  WRENCHBOARD_USER_USESAVEDCC;
diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php
index c40c2664..576f0b87 100644
--- a/www-api/app/Models/ResultFormatter.php
+++ b/www-api/app/Models/ResultFormatter.php
@@ -587,7 +587,8 @@ class ResultFormatter extends Model
                         "symbol" => $out["symbol_${key}"],
                         "description" => $out["description_${key}"],
                         "action_type" => $out["action_type_${key}"],
-                        "code" => $out["code_${key}"]
+                        "code" => $out["code_${key}"],
+                        "country" => $out["country_${key}"]
                     );
                 }
                 break;