fix

microservices/flutterwave-transfer-micro/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:boron
+FROM node:erbium
 
 # Create app directory
 RUN mkdir -p /usr/src/app

microservices/flutterwave-transfer-micro/README.md

@@ -7,17 +7,37 @@ A microservice to handle flitterware payment services
 * Build the docker image by `docker build -t flutterwave-transfer-micro .`
 
 # Run
-* Set environment variables like `MONGO_URL` and `RABBITMQ_URL`. Full list in the wiki.
+* Set environment variables like `PORT` and `POSTGRE_URL`. Full list in the wiki.
-* `docker run -p <BINDING> -e PORT=<app_port> -e POSTGRE_URL=<postgre_url> -i -t flutterwave-transfer-micro`
+* `docker run -p <BINDING> -e PORT=<app_port> -e POSTGRE_URL=<postgre_url> -e FLUTTERWAVE_API=<flutterwave_config> -i -t flutterwave-transfer-micro`
 
 ## Example configurations
 * binding: 127.0.0.1:3000:3000/tcp
 * app_port: 3000
 * postgre_url: postgresql://wrenchboard:wrenchboard@10.10.10.23:5432/wrenchboard
+* flutterwave_config: eyJCYXNlQXBpVXJsIjoiaHR0cHM6Ly9hcGkuZmx1dHRlcndhdmUuY29tIiwiUHVibGljS2V5IjoiRkxXUFVCS19URVNULTU0YzkwMTQxYjAyODc4OWQ2NzEwNjdiZDcyZjc4MWE5LVgiLCJTZWNyZXRLZXkiOiJGTFdTRUNLX1RFU1QtYzdiYmM4NmQ3ZTcxMDAyNTRjNWU1YmJmMTYyYmYyYjItWCIsIkVuY3J5cHRpb25LZXkiOiJGTFdTRUNLX1RFU1RlOTQ3NGQ0ZTJjZTYifQ==
 
 ## Example command
 
-docker run -p 127.0.0.1:3000:3000/tcp -e PORT=3000 -e POSTGRE_URL='postgresql://wrenchboard:wrenchboard@10.10.10.23:5432/wrenchboard' -i -t flutterwave-transfer-micro
+```
+docker run -p 127.0.0.1:3000:3000/tcp \
+ -e PORT=3000 \
+ -e POSTGRE_URL='postgresql://wrenchboard:wrenchboard@10.10.10.23:5432/wrenchboard' \
+ -e FLUTTERWAVE_API='eyJCYXNlQXBpVXJsIjoiaHR0cHM6Ly9hcGkuZmx1dHRlcndhdmUuY29tIiwiUHVibGljS2V5IjoiRkxXUFVCS19URVNULTU0YzkwMTQxYjAyODc4OWQ2NzEwNjdiZDcyZjc4MWE5LVgiLCJTZWNyZXRLZXkiOiJGTFdTRUNLX1RFU1QtYzdiYmM4NmQ3ZTcxMDAyNTRjNWU1YmJmMTYyYmYyYjItWCIsIkVuY3J5cHRpb25LZXkiOiJGTFdTRUNLX1RFU1RlOTQ3NGQ0ZTJjZTYifQ==' \
+ -i -t flutterwave-transfer-micro
+```
+
+## Flutterwave config
+
+Either use a converniece script base64encoder.js or base64 CLI to encode the config:
+
+```
+echo '{
+  "BaseApiUrl":"https://api.flutterwave.com",
+  "PublicKey":"FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X",
+  "SecretKey":"FLWSECK_TEST-c7bbc86d7e7100254c5e5bbf162bf2b2-X",
+  "EncryptionKey":"FLWSECK_TESTe9474d4e2ce6"
+}' | base64
+```
 
 # Test
 `npm test`

microservices/flutterwave-transfer-micro/api/controller.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const properties = require('../package.json')
-const distance = require('../service/distance');
+const transfer = require('../service/transfer');
 
 var controllers = {
    about: function(req, res) {
@@ -11,13 +11,22 @@ var controllers = {
        }
        res.json(aboutInfo);
    },
-   getDistance: function(req, res) {
+   postTransfer: function(req, res) {
-           distance.find(req, res, function(err, dist) {
+       transfer.create(req, res, function(err, dist) {
-               if (err)
+           if (err) {
-                   res.send(err);
+               res.send(err);
-               res.json(dist);
+           }
-           });
+           res.json(dist);
-       },
+       });
+   },
+   getStatus: function(req, res) {
+       transfer.get(req, res, function(err, dist) {
+           if (err) {
+               res.send(err);
+           }
+           res.json(dist);
+       });
+   },
 };
 
 module.exports = controllers;

microservices/flutterwave-transfer-micro/api/routes.js

@@ -5,6 +5,8 @@ const controller = require('./controller');
 module.exports = function(app) {
    app.route('/about')
        .get(controller.about);
-   app.route('/distance/:zipcode1/:zipcode2')
+   app.route('/create')
-       .get(controller.getDistance);
+       .post(controller.postTransfer);
+   app.route('/status/:id')
+       .get(controller.getStatus);
 };

microservices/flutterwave-transfer-micro/base64decoder.js

@@ -0,0 +1,9 @@
+'use strict';
+
+let data = 'eyJQdWJsaWNLZXkiOiJGTFdQVUJLX1RFU1QtNTRjOTAxNDFiMDI4Nzg5ZDY3MTA2N2JkNzJmNzgxYTktWCIsIlNlY3JldEtleSI6IkZMV1NFQ0tfVEVTVC1jN2JiYzg2ZDdlNzEwMDI1NGM1ZTViYmYxNjJiZjJiMi1YIiwiRW5jcnlwdGlvbktleSI6IkZMV1NFQ0tfVEVTVGU5NDc0ZDRlMmNlNiJ9';
+let buff = new Buffer(data, 'base64');
+let text = buff.toString('ascii');
+let json = JSON.parse(text);
+
+console.log('"' + data + '" converted from Base64 to ASCII is "' + text + '"');
+console.log(json);

microservices/flutterwave-transfer-micro/base64encoder.js

@@ -0,0 +1,13 @@
+'use strict';
+
+let json = {
+  "BaseApiUrl":"https://api.flutterwave.com",
+  "PublicKey":"FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X",
+  "SecretKey":"FLWSECK_TEST-c7bbc86d7e7100254c5e5bbf162bf2b2-X",
+  "EncryptionKey":"FLWSECK_TESTe9474d4e2ce6"
+};
+let data = JSON.stringify(json);
+let buff = new Buffer(data);
+let base64data = buff.toString('base64');
+
+console.log('"' + data + '" converted to Base64 is "' + base64data + '"');

microservices/flutterwave-transfer-micro/docker-compose.yml

@@ -0,0 +1,19 @@
+version: '3'
+services:
+  flutterwave-transfer-micro:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    restart: unless-stopped
+    image: registry.chiefsoft.net/flutterwave-transfer-micro:latest
+    volumes:
+      - ./:/app
+      - '/app/node_modules'
+    ports:
+      - 9086:3000
+    environment:
+      - PORT=3000
+      - POSTGRE_URL='postgresql://wrenchboard:wrenchboard@10.10.10.23:5432/wrenchboard'
+      - FLUTTERWAVE_API='eyJCYXNlQXBpVXJsIjoiaHR0cHM6Ly9hcGkuZmx1dHRlcndhdmUuY29tIiwiUHVibGljS2V5IjoiRkxXUFVCS19URVNULTU0YzkwMTQxYjAyODc4OWQ2NzEwNjdiZDcyZjc4MWE5LVgiLCJTZWNyZXRLZXkiOiJGTFdTRUNLX1RFU1QtYzdiYmM4NmQ3ZTcxMDAyNTRjNWU1YmJmMTYyYmYyYjItWCIsIkVuY3J5cHRpb25LZXkiOiJGTFdTRUNLX1RFU1RlOTQ3NGQ0ZTJjZTYifQ=='
+volumes:
+  src:

microservices/flutterwave-transfer-micro/package.json

@@ -1,10 +1,10 @@
 {
   "name": "flutterwave-transfer-micro",
-  "version": "0.0.1",
+  "version": "0.0.4",
-  "description": "A microservice to handle flitterware payment services",
+  "description": "A microservice to handle flutterware payment services",
   "main": "server.js",
   "scripts": {
-    "generate-docs": "jsdoc ./api/*.js ./api/**/*.js ./service/*.js ./services/**/*.js -d docs",
+    "generate-docs": "jsdoc ./api/*.js ./api/**/*.js ./app/*.js ./app/**/*.js ./service/*.js ./service/**/*.js -d docs",
     "lint": "eslint ./ --ext .js",
     "start": "node server.js",
     "start:dev": "nodemon server.js",
@@ -12,9 +12,15 @@
   },
   "author": "Anatolii Okhotnikov <acidumirae@gmail.com>",
   "dependencies": {
-    "pg": "8.7.1",
+    "axios": "^0.24.0",
+    "body-parser": "^1.19.0",
     "express": "^4.17.1",
+    "openapi-types": "^10.0.0",
+    "pg": "8.7.1",
     "request": "^2.88.2",
+    "swagger-autogen": "^2.17.2",
+    "swagger-jsdoc": "^6.1.0",
+    "swagger-ui-express": "^4.3.0",
     "underscore": "^1.8.3",
     "winston": "^2.3.1",
     "winston-papertrail": "^1.0.4"

microservices/flutterwave-transfer-micro/server.js

@@ -1,10 +1,151 @@
-const express = require('express')
+const express = require('express');
 const logger = require('./app/logger');
-const app = express();
+const swaggerUI = require('swagger-ui-express');
+const swaggerJSDocs = require('swagger-jsdoc');
+
 const port = process.env.PORT || 3000;
 
+const definition = {
+  "swagger": "2.0",
+  "info": {
+    "version": "0.0.4",
+    "title": "flutterwave-transfer-micro",
+    "description": "A microservice to handle flitterware payment services"
+  },
+  "host": "localhost:3000",
+  "basePath": "/",
+  "tags": [],
+  "schemes": [
+    "http"
+  ],
+  "consumes": ['application/json'],
+  "produces": ['application/json'],
+  "paths": {
+    "/about": {
+      "get": {
+        "tags": [],
+        "description": "About the microservice (service status)",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/create": {
+      "post": {
+        "tags": [],
+        "description": "Create new transfer",
+        "produces": [
+          "application/json"
+        ],
+	"parameters": [{
+	  "name":"transfer",
+	  "in": "body",
+	  "description": "Transfer to create",
+	  "required": true,
+	  "type":"object",
+	  "schema": {
+              "$ref": "#/definitions/NewTransfer"
+          },
+	  "example": {
+            "account_bank": "044",
+            "account_number": "0690000040",
+            "amount": 5500,
+	    "narration": "Akhlm Pstmn Trnsfr xx007",
+            "currency": "NGN",
+            "reference": "akhlm-pstmnpyt-rfxx007_PMCKDU_1",
+            "debit_currency": "NGN"
+	  }
+	}],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/status/{id}": {
+      "get": {
+        "tags": [],
+        "description": "Get transfer status",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "NewTransfer": {
+      "type": "object",
+      "required": [
+        "account_bank",
+	"account_number",
+	"amount",
+	"narration",
+	"currency",
+	"reference",
+	"debit_currency"
+      ],
+      "properties": {
+        "account_bank": {
+          "type": "string"
+        },
+        "account_number": {
+          "type": "string"
+        },
+	"amount": {
+          "type": "integer"
+        },
+        "narration": {
+          "type": "string"
+        },
+	"currency": {
+          "type": "string"
+        },
+        "reference": {
+          "type": "string"
+        },
+        "debit_currency": {
+          "type": "string"
+        }
+      }
+    },
+  }
+};
+
+const options = {
+  definition,
+  apis: ['./server.js'],
+};
+
+const swaggerSpec = swaggerJSDocs(options);
+
+const app = express();
+
+app.get('/swagger.json', (req, res) => {
+  res.setHeader('Content-Type', 'application/json');
+  res.send(swaggerSpec);
+});
+app.use('/api-docs', swaggerUI.serve, swaggerUI.setup(swaggerSpec));
+
+app.use(express.json());
+app.use(express.urlencoded());
+
 const routes = require('./api/routes');
 routes(app);
-app.listen(port, function() {
+
+app.listen(port, "0.0.0.0", function() {
    logger.info('***** Server started on port: ' + port + ' *****');
 });

microservices/flutterwave-transfer-micro/service/distance.js

@@ -1,36 +0,0 @@
-const request = require('request');
-const db = require('../app/db')
-const logger = require('../app/logger');
-
-const apiKey = process.env.ZIPCODE_API_KEY || "x4hw36qerDOdewjz5HIx4IR7XO5wsWVb7jFZTJ9jvCYYIHNhvK4aIpMExKb5gEoW";
-const zipCodeURL = 'https://www.zipcodeapi.com/rest/';
-
-var distance = {
-   find: function(req, res, next) {
-       var url = zipCodeURL + apiKey 
-               + '/distance.json/' + req.params.zipcode1 + '/' 
-               + req.params.zipcode2 + '/mile';
-       logger.info(url);
-       process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
-       request(url,
-       function (error, response, body) {
-           if (!error && response.statusCode == 200) {
-               response = JSON.parse(body);
-               res.send(response);
-           } else {
-               logger.info(error);
-               res.send({distance: -1});
-           }
-       });
-       // Sample DB call
-       db.query('SELECT NOW()', (err, res) => {
-         if (err) {
-           throw err;
-         }
-         logger.info('time:', res.rows[0])
-       });
-   }
-};
-
-module.exports = distance;
-

microservices/flutterwave-transfer-micro/service/transfer.js

@@ -0,0 +1,98 @@
+'use strict';
+
+const axios = require('axios');
+const request = require('request');
+const db = require('../app/db')
+const logger = require('../app/logger');
+
+// https://developer.flutterwave.com/reference/create-a-transfer
+const flutterwaveConfigBuffer = new Buffer(process.env.FLUTTERWAVE_API, 'base64');
+const flutterwaveConfig = JSON.parse(flutterwaveConfigBuffer.toString('ascii'));
+
+var transfer = {
+   create: function(req, res, next) {
+       var url = flutterwaveConfig.BaseApiUrl + '/v3/transfers';
+       var headersOpt = {  
+           "Content-Type": "application/json",
+           "Authorization": "Bearer " + flutterwaveConfig.SecretKey,
+       };
+       var data = {
+                   "account_bank": req.body.account_bank,
+                   "account_number": req.body.account_number,
+                   "amount": req.body.amount,
+                   "narration": req.body.narration,
+                   "currency": req.body.currency,
+                   "reference": req.body.reference,
+                   "debit_currency": req.body.debit_currency
+       };
+       var options = {
+           headers: headersOpt
+       };
+       logger.info(url);
+       logger.info(options);
+       logger.info(data);
+       // https://blog.logrocket.com/5-ways-to-make-http-requests-in-node-js/
+       // https://stackoverflow.com/questions/53846709/how-do-i-use-axios-within-expressjs
+       axios.post(url, data, options)
+           .then(data => {
+               res.json(data);
+           })
+           .catch(err => {
+               logger.error(err.message);
+               //logger.error(err.stack);
+               logger.error(err.response.data);
+               //logger.error(err.response.headers);
+               res.send({
+                   status: "failure", 
+                   message: "Invalid response", 
+                   details: err.message,
+                   code: err.response.status,
+                   data: err.response.data
+               });
+           });
+       // TODO: Do we save the response in the DB? I assume: YES
+       db.query('SELECT NOW()', (err, res) => {
+         if (err) {
+           throw err;
+         }
+         logger.info('time:', res.rows[0])
+       });
+   },
+   get: function(req, res, next) {
+       var url = flutterwaveConfig.BaseApiUrl + '/v3/transfers/' + req.params.id;
+       var headersOpt = {
+           "Authorization": "Bearer " + flutterwaveConfig.SecretKey,
+       };
+       var options = {
+           headers: headersOpt
+       };
+       logger.info(url);
+       axios.get(url, options)
+           .then(data => {
+               res.json(data);
+           })
+           .catch(err => {
+               logger.error(err.message);
+               //logger.error(err.stack);
+               logger.error(err.response.data);
+               //logger.error(err.response.headers);
+               res.send({
+                   status: "failure", 
+                   message: "Invalid response", 
+                   details: err.message,
+                   code: err.response.status,
+                   data: err.response.data
+               });
+           });
+       // TODO: Do we save the response in the DB? I assume: YES
+       db.query('SELECT NOW()', (err, res) => {
+         if (err) {
+           throw err;
+         }
+         logger.info('time:', res.rows[0])
+       });
+   }
+};
+
+module.exports = transfer;
+

microservices/flutterwave-transfer-micro/swagger.js

@@ -0,0 +1,8 @@
+const swaggerAutogen = require('swagger-autogen')();
+
+const outputFile = './swagger.json';
+const endpointsFiles = ['./api/routes.js']
+
+swaggerAutogen(outputFile, endpointsFiles).then(() => {
+    require('./server.js')
+})

wrenchboard/email/ACCOUNT/member_completepass.mailfile

@@ -16,17 +16,16 @@ img {height: auto;}
 .subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;}
 .h1, .h2, .bodycopy {color: #153643; font-family: sans-serif;}
 .h1 {font-size: 33px; line-height: 38px; font-weight: bold;}
-.h2 {padding: 0 0 15px 0; font-size: 24px; line-height: 28px; font-weight: bold;}
 .bodycopy {font-size: 14px; line-height: 20px;}
 .button {text-align: center; font-size: 16px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
 .button a {color: #ffffff; text-decoration: none;}
-.footer {padding: 20px 30px 15px 30px;}
+.footer {padding: 20px 30px 15px 30px; bgcolor:#007bff; background-color:#007bff;}
 .footercopy {font-family: sans-serif; font-size: 14px; color: #ffffff;}
 .footercopy a {color: #ffffff; text-decoration: underline;}
 </style>
 </head>
 
-<body yahoo bgcolor="#f6f8f1">
+<body bgcolor="#f6f8f1">
 <table width="100%" bgcolor="#f6f8f1" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td>
@@ -50,12 +49,12 @@ img {height: auto;}
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 
 <tr>
-<td class="h1" style="padding: 5px 0 0 0;">
+<td style="padding: 1px 0 1px 0; text-align:center;">
-{{site_name}}
+<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
 </td>
 </tr>
 <tr>
-<td class="subhead" style="padding: 0 0 0 3px;">
+<td class="subhead" style="padding: 0 0 0 3px;  text-align:center;">
 {{site_trade_name}}
 </td>
 </tr>
@@ -131,13 +130,12 @@ For all support, contact us at  <a href="https://{{server_name}}/contact">https:
 </td>
 </tr>
 <tr>
-<td class="footer" bgcolor="#44525f">
+<td class="footer">
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr>
 <td align="center" class="footercopy">
-&reg; {{site_name}} 2018<br/>
+&reg; {{site_name}} 2022<br/>
-You received this email because you subscribe to {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.  
+You received this email because you subscribe to {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contact" class="unsubscribe"><font color="#ffffff">contact</font></a> us.  
-
 </td>
 </tr>
 <tr>
@@ -150,7 +148,7 @@ You received this email because you subscribe to {{site_name}}. If you get this
 </a>
 </td>
 <td width="37" style="text-align: center; padding: 0 10px 0 10px;">
-<a href="https://twitter.com/wrenchboard">
+<a href="http://www.twitter.com/">
 <img src="https://{{server_name}}/assets/images/brands/twitter.png" width="37" height="37" alt="Twitter" border="0" />
 </a>
 </td>
@@ -171,7 +169,8 @@ You received this email because you subscribe to {{site_name}}. If you get this
 </tr>
 </table>
 
-<!--analytics-->
-<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
 </body>
 </html>
+
+
+

wrenchboard/email/ACCOUNT/member_login.mailfile

@@ -4,7 +4,7 @@ Subject: {{site_name}} - Log in Confirmation
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta charset="utf-8"> 
 <title>{{site_name}} - Log in Confirmation</title>
 <style type="text/css">
 body {margin: 0; padding: 0; min-width: 100%!important;}
@@ -16,17 +16,16 @@ img {height: auto;}
 .subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;}
 .h1, .h2, .bodycopy {color: #153643; font-family: sans-serif;}
 .h1 {font-size: 33px; line-height: 38px; font-weight: bold;}
-.h2 {padding: 0 0 15px 0; font-size: 24px; line-height: 28px; font-weight: bold;}
 .bodycopy {font-size: 14px; line-height: 20px;}
 .button {text-align: center; font-size: 16px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
 .button a {color: #ffffff; text-decoration: none;}
-.footer {padding: 20px 30px 15px 30px;}
+.footer {padding: 20px 30px 15px 30px; bgcolor:#007bff; background-color:#007bff;}
 .footercopy {font-family: sans-serif; font-size: 14px; color: #ffffff;}
 .footercopy a {color: #ffffff; text-decoration: underline;}
 </style>
 </head>
 
-<body yahoo bgcolor="#f6f8f1">
+<body bgcolor="#f6f8f1">
 <table width="100%" bgcolor="#f6f8f1" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td>
@@ -43,18 +42,18 @@ img {height: auto;}
 <tr>
 <td>
 <![endif]-->
-<table class="col425" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 425px;">  
+<table align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px;">  
 <tr>
-<td height="50">
+<td height="30" border="0" style="text-align:center;">
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 
 <tr>
-<td class="h1" style="padding: 5px 0 0 0;">
+<td style="padding: 1px 0 1px 0; text-align:center;">
-{{site_name}}
+<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
 </td>
 </tr>
 <tr>
-<td class="subhead" style="padding: 0 0 0 3px;">
+<td class="subhead" style="padding: 0 0 0 3px;  text-align:center;">
 {{site_trade_name}}
 </td>
 </tr>
@@ -69,18 +68,7 @@ img {height: auto;}
 <![endif]-->
 </td>
 </tr>
-<tr>
-<td class="innerpadding borderbottom">
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-<tr>
-<td>
-Hello {{firstname}},
-</td>
-</tr>
 
-</table>
-</td>
-</tr>
 <tr>
 <td class="innerpadding borderbottom">
 <!--[if (gte mso 9)|(IE)]>
@@ -90,29 +78,22 @@ Hello {{firstname}},
 <![endif]-->
 <table class="col380" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">  
 <tr>
+<td class="bodycopy">
+Hello {{firstname}},
+</td>
+</tr>
+<tr>
 <td>
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr>
 <td class="bodycopy">
-Please be informed that you logged on to {{site_name}} account at <b>{{last_login2}}</b> from <b>{{loc}}</b>. 
+Please be informed that you logged on to {{site_name}} account at <b>{{last_login2}}</b>.
-</td>
-</tr>
-
-<tr>
-<td class="bodycopy">
 If you did not log on to your account at the time detailed above, please contact us immediately.
 </td>
 </tr>
-
 </table>
 </td>
 </tr>
-
-
-
-
-
-
 </table>
 <!--[if (gte mso 9)|(IE)]>
 </td>
@@ -156,12 +137,12 @@ Recently added task(s)
 
 
 <tr>
-<td class="footer" bgcolor="#44525f">
+<td class="footer">
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr>
 <td align="center" class="footercopy">
-&reg; {{site_name}} 2018<br/>
+&reg; {{site_name}} 2022<br/>
-You received this email because you subscribe to {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.  
+You received this email because you subscribe to {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contact" class="unsubscribe"><font color="#ffffff">contact</font></a> us.  
 
 </td>
 </tr>
@@ -195,8 +176,5 @@ You received this email because you subscribe to {{site_name}}. If you get this
 </td>
 </tr>
 </table>
-
-<!--analytics-->
-<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
 </body>
 </html>

wrenchboard/email/ACCOUNT/member_pending.mailfile

@@ -97,7 +97,7 @@ body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px;
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr>
 <td>
-Dear {{firstname}},
+Dear {{firstname}}, 
 </td>
 </tr>
 <tr>

wrenchboard/email/ACCOUNT/member_pending_mobile.mailfile

@@ -4,33 +4,28 @@ Subject: {{site_name}} - Pending Signup - Verify {{email}}
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta charset="utf-8"> 
 <title>{{site_name}} - Pending Signup - Verify {{email}}</title>
 <style type="text/css">
 body {margin: 0; padding: 0; min-width: 100%!important;}
 img {height: auto;}
 .content {width: 100%; max-width: 600px;}
 .header {padding: 10px 10px 10px 10px;}
-.innerpadding {padding: 30px 30px 30px 30px;}
+.innerpadding {padding: 10px 10px 10px 10px;}
 .borderbottom {border-bottom: 1px solid #f2eeed;}
 .subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;}
 .h1, .h2, .bodycopy {color: #153643; font-family: sans-serif;}
 .h1 {font-size: 33px; line-height: 38px; font-weight: bold;}
-.h2 {padding: 0 0 15px 0; font-size: 24px; line-height: 28px; font-weight: bold;}
+.bodycopy {font-size: 14px; line-height: 20px;}
-.h3 {padding: 0 0 15px 0; font-size: 20px; line-height: 20px; font-weight: bold;}
+.button {text-align: center; font-size: 16px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
-.bodycopy {font-size: 16px; line-height: 22px;}
-.button {text-align: center; font-size: 18px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
 .button a {color: #ffffff; text-decoration: none;}
-.footer {padding: 20px 30px 15px 30px;}
+.footer {padding: 20px 30px 15px 30px; bgcolor:#007bff; background-color:#007bff;}
 .footercopy {font-family: sans-serif; font-size: 14px; color: #ffffff;}
 .footercopy a {color: #ffffff; text-decoration: underline;}
-
-
-
 </style>
 </head>
 
-<body yahoo bgcolor="#f6f8f1">
+<body bgcolor="#f6f8f1">
 <table width="100%" bgcolor="#f6f8f1" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td>
@@ -47,18 +42,18 @@ img {height: auto;}
 <tr>
 <td>
 <![endif]-->
-<table class="col425" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 100%;">  
+<table align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px;">  
 <tr>
-<td height="50">
+<td height="30" border="0" style="text-align:center;">
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 
 <tr>
-<td class="h1" style="padding: 5px 0 0 0;">
+<td style="padding: 1px 0 1px 0; text-align:center;">
-{{site_name}}
+<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
 </td>
 </tr>
 <tr>
-<td class="subhead" style="padding: 0 0 0 3px;">
+<td class="subhead" style="padding: 0 0 0 3px;  text-align:center;">
 {{site_trade_name}}
 </td>
 </tr>
@@ -73,17 +68,23 @@ img {height: auto;}
 <![endif]-->
 </td>
 </tr>
+
 <tr>
 <td class="innerpadding borderbottom">
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<!--[if (gte mso 9)|(IE)]>
+<table width="100%" align="left" cellpadding="0" cellspacing="0" border="0">
 <tr>
 <td>
-Dear {{firstname}},
+<![endif]-->
+<table class="col380" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">  
+<tr>
+<td class="bodycopy">
+Hello {{firstname}},
 </td>
 </tr>
 <tr>
 <td class="bodycopy">
-Welcome to {{site_name}}!. In order to complete your registration , use the number below to complete registration.
+&nbsp;&nbsp;Welcome to {{site_name}}!. In order to complete your registration , use the number below to complete registration.
 </td>
 </tr>
 </table>
@@ -103,25 +104,17 @@ Welcome to {{site_name}}!. In order to complete your registration , use the numb
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr>
 <td class="bodycopy">
-<b>Enter the number to continue :</b> <h2>{{signup_random}}</h2>
+For app sign up ,enter the number <b>{{signup_random}}</b> to continue. 
-<br>
+<hr size="1">
+For Web sign up , <a href="https://{{server_name}}/vemail?vlnk={{verify_link}}">Click here to verify account</a>  to continue. 
 <hr size="1">
-Or
-<table class="buttonwrapper" bgcolor="#e05443" border="0" cellspacing="0" cellpadding="0">
-<tr>
-<td class="button" height="45" style="align-center;">
-<a href="https://{{server_name}}/vemail?vlnk={{verify_link}}">Click to Verify Account</a>
-</td>
-</tr>
-</table>
 </td>
 </tr>
 <tr> 
 <td class="bodycopy" style="color:#ff0033">
-The Link will expire by {{expire}}
+Note : The link will expire by:{{expire}}
 </td>
 </tr>
-
 </table>
 </td>
 </tr>
@@ -134,15 +127,10 @@ The Link will expire by {{expire}}
 </td>
 </tr>
 <tr>
-<td class="innerpadding borderbottom">
-<img class="fix" src="https://{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
-</td>
-</tr>
-<tr>
 <td class="innerpadding bodycopy">
-If you did not initiate this account creation or have any further support question, Please contact us at  https://{{server_name}}/contact<br>
+&nbsp;&nbsp;If you did not initiate this account creation or have any further support question, Please contact us at  https://{{server_name}}/contact<br>
 <hr size="1">
-With <a href="http://{{server_name}}">{{site_name}}</a>, you can enjoy free coordinated skills training section. Empower yourself and be around those that work with latest to update your knowledge.
+&nbsp;&nbsp;With <a href="http://{{server_name}}">{{site_name}}</a>,you can enjoy free connection to makerplace for all of your ability. We are simply here to empower you..
 </td>
 </tr>
 <tr>
@@ -153,12 +141,12 @@ With <a href="http://{{server_name}}">{{site_name}}</a>, you can enjoy free coor
 </td>
 </tr>
 <tr>
-<td class="footer" bgcolor="#44525f">
+<td class="footer">
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr>
 <td align="center" class="footercopy">
-&reg; {{site_name}} 2018<br/>
+&reg; {{site_name}} 2022<br/>
-You received this email because you subscribe to {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.  
+You received this email because you subscribe to {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contact" class="unsubscribe"><font color="#ffffff">contact</font></a> us.  
 </td>
 </tr>
 <tr>
@@ -192,8 +180,6 @@ You received this email because you subscribe to {{site_name}}. If you get this
 </tr>
 </table>
 
-<!--analytics-->
-<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
 </body>
 </html>
 

wrenchboard/email/ACCOUNT/member_resetpass.mailfile

@@ -16,17 +16,16 @@ img {height: auto;}
 .subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;}
 .h1, .h2, .bodycopy {color: #153643; font-family: sans-serif;}
 .h1 {font-size: 33px; line-height: 38px; font-weight: bold;}
-.h2 {padding: 0 0 15px 0; font-size: 24px; line-height: 28px; font-weight: bold;}
 .bodycopy {font-size: 14px; line-height: 20px;}
 .button {text-align: center; font-size: 16px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
 .button a {color: #ffffff; text-decoration: none;}
-.footer {padding: 20px 30px 15px 30px;}
+.footer {padding: 20px 30px 15px 30px; bgcolor:#007bff; background-color:#007bff;}
 .footercopy {font-family: sans-serif; font-size: 14px; color: #ffffff;}
 .footercopy a {color: #ffffff; text-decoration: underline;}
 </style>
 </head>
 
-<body yahoo bgcolor="#f6f8f1">
+<body bgcolor="#f6f8f1">
 <table width="100%" bgcolor="#f6f8f1" border="0" cellpadding="0" cellspacing="0">
 <tr>
   <td>
@@ -44,22 +43,22 @@ img {height: auto;}
               <tr>
                 <td>
           <![endif]-->
-          <table class="col425" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 425px;">  
+          <table class="col425" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px;">  
             <tr>
               <td height="50">
-                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
 
-                  <tr>
+<tr>
-                    <td class="h1" style="padding: 5px 0 0 0;">
+<td style="padding: 1px 0 1px 0; text-align:center;">
-                     {{site_name}}
+<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
-                    </td>
+</td>
-                  </tr>
+</tr>
-                  <tr>
+<tr>
-                    <td class="subhead" style="padding: 0 0 0 3px;">
+<td class="subhead" style="padding: 0 0 0 3px;  text-align:center;">
-                      {{site_trade_name}}
+{{site_trade_name}}
-                    </td>
+</td>
-                  </tr>
+</tr>
-                </table>
+</table>
               </td>
             </tr>
           </table>
@@ -74,7 +73,7 @@ img {height: auto;}
         <td class="innerpadding borderbottom">
           <table width="100%" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td class="h2">
+              <td class="bodycopy">
                 Hello {{firstname}},
               </td>
             </tr>
@@ -107,8 +106,8 @@ img {height: auto;}
                     <td style="padding: 20px 0 0 0;">
                       <table class="buttonwrapper" bgcolor="#e05443" border="0" cellspacing="0" cellpadding="0">
                         <tr>
-                          <td class="button" height="45">
+                          <td class="button" height="45" style="text-align:center;"	>
-                            <a href="https://{{server_name}}/complereset?passlink={{pass_link}}">Click to Reset Password</a>
+                            <a href="{{server_name}}/complereset?passlink={{pass_link}}">Click to Reset Password</a>
                           </td>
                         </tr>
                       </table>
@@ -128,7 +127,7 @@ img {height: auto;}
 
       <tr>
         <td class="innerpadding bodycopy">
-         If you did not initiate this password reset or have any further support question, please contact us at  https://{{server_name}}/contact
+         If you did not initiate this password reset or have any further support question, please contact us at {{server_name}}/contact
         </td>
       </tr>
    <tr>
@@ -139,47 +138,47 @@ img {height: auto;}
         </td>
       </tr>
       <tr>
-        <td class="footer" bgcolor="#44525f">
+<td class="footer">
-          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
-            <tr>
+<tr>
-              <td align="center" class="footercopy">
+<td align="center" class="footercopy">
-                &reg; {{site_name}} 2018<br/>
+&reg; {{site_name}} 2022<br/>
-               You received this email because you subscribe to {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.  
+You received this email because you subscribe to {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contact" class="unsubscribe"><font color="#ffffff">contact</font></a> us.  
-               
+</td>
-              </td>
+</tr>
-            </tr>
+<tr>
-            <tr>
+<td align="center" style="padding: 20px 0 0 0;">
-              <td align="center" style="padding: 20px 0 0 0;">
+<table border="0" cellspacing="0" cellpadding="0">
-                <table border="0" cellspacing="0" cellpadding="0">
+<tr>
-                  <tr>
+<td width="37" style="text-align: center; padding: 0 10px 0 10px;">
-                    <td width="37" style="text-align: center; padding: 0 10px 0 10px;">
+<a href="https://www.facebook.com/wrenchboard/">
-                      <a href="https://www.facebook.com/wrenchboard/">
+<img src="https://{{server_name}}/assets/images/brands/facebook.png" width="37" height="37" alt="Facebook" border="0" />
-                        <img src="https://{{server_name}}/assets/images/brands/facebook.png" width="37" height="37" alt="Facebook" border="0" />
+</a>
-                      </a>
+</td>
-                    </td>
+<td width="37" style="text-align: center; padding: 0 10px 0 10px;">
-                    <td width="37" style="text-align: center; padding: 0 10px 0 10px;">
+<a href="http://www.twitter.com/">
-                      <a href="https://twitter.com/wrenchboard">
+<img src="https://{{server_name}}/assets/images/brands/twitter.png" width="37" height="37" alt="Twitter" border="0" />
-                        <img src="https://{{server_name}}/assets/images/brands/twitter.png" width="37" height="37" alt="Twitter" border="0" />
+</a>
-                      </a>
+</td>
-                    </td>
+</tr>
-                  </tr>
+</table>
-                </table>
+</td>
-              </td>
+</tr>
-            </tr>
+</table>
-          </table>
+</td>
-        </td>
+</tr>
-      </tr>
+</table>
-    </table>
+<!--[if (gte mso 9)|(IE)]>
-    <!--[if (gte mso 9)|(IE)]>
+</td>
-          </td>
+</tr>
-        </tr>
+</table>
-    </table>
+<![endif]-->
-    <![endif]-->
+</td>
-    </td>
+</tr>
-  </tr>
 </table>
 
-<!--analytics-->
-<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
 </body>
 </html>
+
+
+

wrenchboard/email/ACCOUNT/member_welcome.mailfile

@@ -6,42 +6,26 @@ Subject: Welcome to {{site_name}}
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>Welcome to {{site_name}}</title>
-  <style type="text/css">
+<style type="text/css">
-  body {margin: 0; padding: 0; min-width: 100%!important;}
+body {margin: 0; padding: 0; min-width: 100%!important;}
-  img {height: auto;}
+img {height: auto;}
-  .content {width: 100%; max-width: 600px;}
+.content {width: 100%; max-width: 600px;}
-  .header {padding: 40px 30px 20px 30px;}
+.header {padding: 10px 10px 10px 10px;}
-  .innerpadding {padding: 30px 30px 30px 30px;}
+.innerpadding {padding: 10px 10px 10px 10px;}
-  .borderbottom {border-bottom: 1px solid #f2eeed;}
+.borderbottom {border-bottom: 1px solid #f2eeed;}
-  .subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;}
+.subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;}
-  .h1, .h2, .bodycopy {color: #153643; font-family: sans-serif;}
+.h1, .h2, .bodycopy {color: #153643; font-family: sans-serif;}
-  .h1 {font-size: 33px; line-height: 38px; font-weight: bold;}
+.h1 {font-size: 33px; line-height: 38px; font-weight: bold;}
-  .h2 {padding: 0 0 15px 0; font-size: 24px; line-height: 28px; font-weight: bold;}
+.bodycopy {font-size: 14px; line-height: 20px;}
-  .bodycopy {font-size: 16px; line-height: 22px;}
+.button {text-align: center; font-size: 16px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
-  .button {text-align: center; font-size: 18px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
+.button a {color: #ffffff; text-decoration: none;}
-  .button a {color: #ffffff; text-decoration: none;}
+.footer {padding: 20px 30px 15px 30px; bgcolor:#007bff; background-color:#007bff;}
-  .footer {padding: 20px 30px 15px 30px;}
+.footercopy {font-family: sans-serif; font-size: 14px; color: #ffffff;}
-  .footercopy {font-family: sans-serif; font-size: 14px; color: #ffffff;}
+.footercopy a {color: #ffffff; text-decoration: underline;}
-  .footercopy a {color: #ffffff; text-decoration: underline;}
+</style>
-
-  @media only screen and (max-width: 550px), screen and (max-device-width: 550px) {
-  body[yahoo] .hide {display: none!important;}
-  body[yahoo] .buttonwrapper {background-color: transparent!important;}
-  body[yahoo] .button {padding: 0px!important;}
-  body[yahoo] .button a {background-color: #e05443; padding: 15px 15px 13px!important;}
-  body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px; background: #2f3942; border-radius: 5px; text-decoration: none!important; font-weight: bold;}
-  }
-
-  /*@media only screen and (min-device-width: 601px) {
-    .content {width: 600px !important;}
-    .col425 {width: 425px!important;}
-    .col380 {width: 380px!important;}
-    }*/
-
-  </style>
 </head>
 
-<body yahoo bgcolor="#f6f8f1">
+<body bgcolor="#f6f8f1">
 <table width="100%" bgcolor="#f6f8f1" border="0" cellpadding="0" cellspacing="0">
 <tr>
   <td>
@@ -53,42 +37,20 @@ Subject: Welcome to {{site_name}}
     <table bgcolor="#ffffff" class="content" align="center" cellpadding="0" cellspacing="0" border="0">
       <tr>
         <td bgcolor="#c7d8a7" class="header">
-          <table width="70" align="left" border="0" cellpadding="0" cellspacing="0">  
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td height="70" style="padding: 0 20px 20px 0;">
-                <img class="fix" src="https://{{server_name}}/assets/images/wrenchboard-icon.gif" width="70" height="70" border="0" alt="WrenchBoard" />
-              </td>
-            </tr>
-          </table>
-          <!--[if (gte mso 9)|(IE)]>
-            <table width="425" align="left" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td>
-          <![endif]-->
-          <table class="col425" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 425px;">  
-            <tr>
-              <td height="50">
-                <table width="100%" border="0" cellspacing="0" cellpadding="0">
 
-                  <tr>
+					<tr>
-                    <td class="h1" style="padding: 5px 0 0 0;">
+					<td style="padding: 1px 0 1px 0; text-align:center;">
-                     {{site_name}}
+					<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
-                    </td>
+					</td>
-                  </tr>
+					</tr>
-                  <tr>
+					<tr>
-                    <td class="subhead" style="padding: 0 0 0 3px;">
+					<td class="subhead" style="padding: 0 0 0 3px;  text-align:center;">
-                      {{site_trade_name}}
+					{{site_trade_name}}
-                    </td>
+					</td>
-                  </tr>
+					</tr>
-                </table>
+					</table>
-              </td>
+     
-            </tr>
-          </table>
-          <!--[if (gte mso 9)|(IE)]>
-                </td>
-              </tr>
-          </table>
-          <![endif]-->
         </td>
       </tr>
       <tr>
@@ -160,11 +122,11 @@ With <a href="http://{{server_name}}">{{site_name}}</a>, you can enjoy free coor
         </td>
       </tr>
       <tr>
-        <td class="footer" bgcolor="#44525f">
+        <td class="footer">
           <table width="100%" border="0" cellspacing="0" cellpadding="0">
             <tr>
               <td align="center" class="footercopy">
-                &reg; {{site_name}} 2017<br/>
+                &reg; {{site_name}} 2022<br/>
                You received this email because you subscribe to {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.  
                
               </td>
@@ -199,8 +161,5 @@ With <a href="http://{{server_name}}">{{site_name}}</a>, you can enjoy free coor
     </td>
   </tr>
 </table>
-
-<!--analytics-->
-<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
 </body>
 </html>

wrenchboard/email/ALERT/alert_signup.mailfile

@@ -11,20 +11,17 @@ body {margin: 0; padding: 0; min-width: 100%!important;}
 img {height: auto;}
 .content {width: 100%; max-width: 600px;}
 .header {padding: 10px 10px 10px 10px;}
-.innerpadding {padding: 30px 30px 30px 30px;}
+.innerpadding {padding: 10px 10px 10px 10px;}
 .borderbottom {border-bottom: 1px solid #f2eeed;}
 .subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;}
 .h1, .h2, .bodycopy {color: #153643; font-family: sans-serif;}
 .h1 {font-size: 33px; line-height: 38px; font-weight: bold;}
-.h2 {padding: 0 0 15px 0; font-size: 24px; line-height: 28px; font-weight: bold;}
 .bodycopy {font-size: 14px; line-height: 20px;}
 .button {text-align: center; font-size: 16px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
 .button a {color: #ffffff; text-decoration: none;}
-.footer {padding: 20px 30px 15px 30px;}
+.footer {padding: 20px 30px 15px 30px; bgcolor:#007bff; background-color:#007bff;}
 .footercopy {font-family: sans-serif; font-size: 14px; color: #ffffff;}
 .footercopy a {color: #ffffff; text-decoration: underline;}
-
-
 </style>
 </head>
 
@@ -52,8 +49,8 @@ img {height: auto;}
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 
 <tr>
-<td class="h1" style="padding: 5px 0 0 0;">
+<td style="padding: 1px 0 1px 0; text-align:center;">
-{{site_name}}
+<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a>
 </td>
 </tr>
 <tr>
@@ -75,13 +72,6 @@ img {height: auto;}
 
 <tr>
 <td class="innerpadding borderbottom">
-<table width="115" align="left" border="0" cellpadding="0" cellspacing="0">  
-<tr>
-<td height="115" style="padding: 0 20px 20px 0;">
-<img class="fix" src="https://{{server_name}}/assets/images/article1.png" width="115" height="115" border="0" alt="" />
-</td>
-</tr>
-</table>
 <!--[if (gte mso 9)|(IE)]>
 <table width="380" align="left" cellpadding="0" cellspacing="0" border="0">
 <tr>
@@ -94,8 +84,10 @@ img {height: auto;}
 <td>
 <table width="100%" border="0" cellspacing="1" cellpadding="0" class="bodycopy" style="font-size: 14px; font-family: sans-serif; border: 1px solid #f2eeed; background-color:#e6f9ff;">
 <tr >		
-<td colspan="2"><h3>Signup Pending-{{added}}</h3></td>
+<td class="left" style="width:100px">Signup Pending</td>
+<td class="bodycopy">{{added}}</td>				
 </tr>	
+<tr>
 
 <tr >		
 <td class="left" style="width:100px">Firstname</td>
@@ -125,15 +117,14 @@ img {height: auto;}
 <td class="bodycopy">{{verify_link}}</td>				
 </tr>
 
+<tr >		
+<td class="left" colspan="2">Please <a href ="https://{{server_name}}/bko">login</a> into BackOffice from authorized system to support the user.</td>
+</tr>
 
 
 </table>
 </td>
 </tr>
-<tr>
-<td><h4>Please <a href ="https://{{server_name}}/bko">login</a> into BackOffice from authorized system to support the user.</h4>
-</td>
-</tr>
 </table>
 <!--[if (gte mso 9)|(IE)]>
 </td>
@@ -144,7 +135,7 @@ img {height: auto;}
 </tr>
 <tr>
 <td class="innerpadding borderbottom">
-<img class="fix" src="https://{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
+<img class="fix" src="https://dashboard.wrenchboard.com/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
 </td>
 </tr>
 
@@ -156,11 +147,11 @@ img {height: auto;}
 </td>
 </tr>
 <tr>
-<td class="footer" bgcolor="#44525f">
+<td class="footer">
 <table width="100%" border="0" cellspacing="0" cellpadding="0" >
 <tr>
 <td align="center" class="footercopy">
-&reg; {{site_name}} 2017<br/>
+&reg; {{site_name}} 2022<br/>
 You received this email because you are a support user for {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.                 
 </td>
 </tr>
@@ -196,6 +187,5 @@ You received this email because you are a support user for {{site_name}}. If you
 </table>
 
 <!--analytics-->
-<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
 </body>
 </html>

wrenchboard/email/JOB/job_offer_public.mailfile

@@ -16,16 +16,12 @@ img {height: auto;}
 .subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;}
 .h1, .h2, .bodycopy {color: #153643; font-family: sans-serif;}
 .h1 {font-size: 33px; line-height: 38px; font-weight: bold;}
-.h2 {padding: 0 0 15px 0; font-size: 24px; line-height: 28px; font-weight: bold;}
 .bodycopy {font-size: 14px; line-height: 20px;}
 .button {text-align: center; font-size: 16px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
 .button a {color: #ffffff; text-decoration: none;}
-.footer {padding: 20px 30px 15px 30px;}
+.footer {padding: 20px 30px 15px 30px; bgcolor:#007bff; background-color:#007bff;}
 .footercopy {font-family: sans-serif; font-size: 14px; color: #ffffff;}
 .footercopy a {color: #ffffff; text-decoration: underline;}
-
-
-</style>
 </style>
 </head>
 
@@ -47,18 +43,18 @@ img {height: auto;}
   <tr>
 	<td>
 <![endif]-->
-<table class="col425" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 425px;">  
+<table class="col425" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px;">  
 <tr>
   <td height="50">
 	<table width="100%" border="0" cellspacing="0" cellpadding="0">
 
 	  <tr>
-		<td class="h1" style="padding: 5px 0 0 0;">
+		<td style="padding: 1px 0 1px 0; text-align:center;">
-		 {{site_name}}
+		 <a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> 
 		</td>
 	  </tr>
 	  <tr>
-		<td class="subhead" style="padding: 0 0 0 3px;">
+		<td class="subhead" style="padding: 0 0 0 3px;  text-align:center;">
 		  {{site_trade_name}}
 		</td>
 	  </tr>
@@ -77,7 +73,7 @@ img {height: auto;}
 <td class="innerpadding borderbottom">
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr>
-  <td class="h2">
+<td class="bodycopy">
    Dear {{firstname}},
   </td>
 </tr>
@@ -95,7 +91,7 @@ You have posted a job offer at <a href="https://{{server_name}}">{{site_name}}</
 <table width="115" align="left" border="0" cellpadding="0" cellspacing="0">  
 <tr>
   <td height="115" style="padding: 0 20px 20px 0;">
-	<img class="fix" src="https://{{server_name}}/assets/images/article1.png" width="115" height="115" border="0" alt="" />
+	<img class="fix" src="https://dashboard.wrenchboard.com/assets/images/article1.png" width="115" height="115" border="0" alt="" />
   </td>
 </tr>
 </table>
@@ -186,7 +182,7 @@ Offer Expire
 </tr>
 <tr>
 <td class="innerpadding borderbottom">
-<img class="fix" src="https://{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
+<img class="fix" src="https://dashboard.wrenchboard.com/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
 </td>
 </tr>
 <tr>
@@ -202,12 +198,12 @@ Please contact us at  https://{{server_name}}/contact if you have any question a
 </td>
 </tr>
 <tr>
-<td class="footer" bgcolor="#44525f">
+<td class="footer">
 <table width="100%" border="0" cellspacing="0" cellpadding="0" >
 <tr>
   <td align="center" class="footercopy">
-	&reg; {{site_name}} 2018<br/>
+	&reg; {{site_name}} 2022<br/>
-   You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.                 
+   You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contact" class="unsubscribe"><font color="#ffffff">contact</font></a> us.                 
   </td>
 </tr>
 <tr>
@@ -242,6 +238,5 @@ Please contact us at  https://{{server_name}}/contact if you have any question a
 </table>
 
 <!--analytics-->
-<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
 </body>
 </html>

wrenchboard/etc/wrenchboard_api.conf

@@ -52,7 +52,8 @@ stripe:
 
 database:
 {
-	host = "127.0.0.1";
+#- using docker 10.23	host = "127.0.0.1";
+	host = "10.10.10.23"; 
 	name = "wrenchboard";
 	user = "wrenchboard";
 	pass = "wrenchboard";

wrenchboard/src/config.log

@@ -10,11 +10,11 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 ## Platform. ##
 ## --------- ##
 
-hostname = localhost.localdomain
+hostname = WrenchBoardDev
 uname -m = x86_64
-uname -r = 4.18.0-193.el8.x86_64
+uname -r = 4.18.0-193.14.2.el8_2.x86_64
 uname -s = Linux
-uname -v = #1 SMP Fri May 8 10:59:10 UTC 2020
+uname -v = #1 SMP Sun Jul 26 03:54:29 UTC 2020
 
 /usr/bin/uname -p = x86_64
 /bin/uname -X     = unknown
@@ -534,10 +534,9 @@ generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on localhost.localdomain
+on WrenchBoardDev
 
 config.status:944: creating config.h
-config.status:1034: config.h is unchanged
 config.status:1048: executing libtool commands
 
 ## ---------------- ##

wrenchboard/src/core/smtp.cc

@@ -117,7 +117,7 @@ int SMTP2( const char * _server, const char * _from, char * _to, char * _body, c
 	}
 
 	// Google
-	snprintf( name, BUF_SIZE, EMAIL_PREFIX"/../src/modules/mailsend -smtp %s -f %s -t %s -domain %s -name '%s' +cc +bcc -v -starttls -port 587 -auth-plain -user %s -pass %s -sub '%s' -content-type 'text/html' -mime-type 'text/html' -M '%s'",
+	snprintf( name, BUF_SIZE, EMAIL_PREFIX"/../src/modules/mailsend -smtp %s -f %s -t %s -domain %s -name '%s' +cc +bcc -v -starttls -port 587 -auth-plain -user %s -pass %s -sub '%s' -content-type 'multipart/mixed' -mime-type 'text/html' -disposition inline -M '%s'",
 	    _server, _from, _to, _domain, _name, _user, _pass, subject, body != NULL ? body : _body );
 /*
 	// Virtualmail

wrenchboard/src/libtool

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Generated automatically by config.status () 
-# Libtool was configured on host localhost.localdomain:
+# Libtool was configured on host WrenchBoardDev:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 
 # Provide generalized library-building support services.

wrenchboard/src/shared_tool/account.cc

@@ -143,7 +143,7 @@ test();
             break;
 
         case WRENCHBOARD_RESET_PASSWORD:
-
+            return WrenchResetMemberPass(in, out);
             break;
 
         case WRENCHBOARD_MOBILE_MESSAGE:
@@ -377,7 +377,7 @@ long  WrenchBoardMobileSendMoney(CVars in, CVars &out){
         sprintf(send_trxid, "T%04lu", r1);
 		
 		logfmt(logINFO, "Recipient ID =====() %lu",in["bankid"].Long() );
-out["sendmoney_message"] ="Processing...";
+                out["sendmoney_message"] ="Processing...";
 
 		
 		REQ_LONG(in, "bankid", 1, -1);
@@ -672,6 +672,9 @@ long WrenchReturnStartJobList(CVars in, CVars &out) {
                 snprintf(vname, sizeof (vname), "description_%05d", i);
                 out[vname] = rec["description"];
 
+                snprintf(vname, sizeof (vname), "expire_%05d", i);
+                out[vname] = rec["expire"];
+                
                 snprintf(vname, sizeof (vname), "id_%05d", i);
                 out[vname] = rec["job_id"];
             }

wrenchboard/src/shared_tool/email.cc

@@ -60,7 +60,7 @@ long SendmarketMessage(CVars in, CVars &out) {
     form.LetStr("site_trade_name", "Connecting Experts with Clients");
     vars2form(in, form);
 
-    in["server_name"] = "https://www.wrenchboard.com";
+    in["server_name"] = "https://dashboard.wrenchboard.com";
     
     int c = 0;
 
@@ -157,7 +157,7 @@ long cron_email(long mailtype, CVars in, CVars &out) {
                 if (load_db_record(x, "SELECT *,email as email2,to_char(last_login, 'Day Mon dd, yyyy HH:MI AM') AS last_login2 FROM members WHERE id = %lu ", in["member_id"].Long())) {
                   
 
-                    in["server_name"] = "https://www.wrenchboard.com";
+                    in["server_name"] = "https://dashboard.wrenchboard.com";
 
                     int c = 0;
 
@@ -233,7 +233,7 @@ long account_email(long mailtype, CVars in, CVars &out) {
     const PGresult *res;
 
     char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+    form.LetStr("server_name",  "https://dashboard.wrenchboard.com");
     form.LetStr("site_name", "WrenchBoard");
     form.LetStr("site_trade_name", "Connecting Experts with Clients");
 
@@ -275,7 +275,7 @@ long account_email(long mailtype, CVars in, CVars &out) {
                 if (load_db_record(x, "SELECT *,email as email2,to_char(last_login, 'Day Mon dd, yyyy HH:MI AM') AS last_login2 FROM members WHERE id = %lu ", in["member_id"].Long())) {
                   
 
-                    in["server_name"] = "https://www.wrenchboard.com";
+                    in["server_name"] = "https://dashboard.wrenchboard.com";
 
                     int c = 0;
 
@@ -321,6 +321,7 @@ long account_email(long mailtype, CVars in, CVars &out) {
                 break;
 
             case ACCOUNT_PASSWORD_RESET:
+                 
                 REQ_LONG(in, "password_reset_id", 1, -1);
                 if (load_db_record(x, "select p.*,m.firstname,m.lastname,m.email, "
                         " TO_CHAR(expired :: TIMESTAMP, 'Day Mon dd, yyyy HH:MI AM') AS long_expired , "
@@ -328,6 +329,7 @@ long account_email(long mailtype, CVars in, CVars &out) {
                         " FROM password_reset p "
                         " LEFT JOIN members m ON m.id =p.member_id  WHERE p.id = %lu ", in["password_reset_id"].Long())) {
                     vars2form(x, form);
+                    form.LetStr("server_name",  server_name);
                     form.Email("ACCOUNT/member_resetpass.mailfile");
                 }
                 break;
@@ -417,7 +419,7 @@ long job_email(long mailtype, CVars in, CVars &out) {
                 vars2form(y, form);
                 // FOR CRON JOBS SET SERVER NAME
                 form.LetStr("preview_count", in["preview_count"].c_str());
-                form.LetStr("server_name", "www.wrenchboard.com");
+                form.LetStr("server_name", "dashboard.wrenchboard.com");
                 vars2form(x, form);
                 form.LetStr("subject", "Completed Task Processing Past Due");
                 form.LetStr("email", y["email"].c_str());
@@ -431,7 +433,7 @@ long job_email(long mailtype, CVars in, CVars &out) {
 
             if (load_db_record(x, "SELECT m.firstname,m.email,mj.title,c.* FROM members_jobs_contract c LEFT JOIN members m ON m.id=c.client_id  LEFT JOIN members_jobs mj ON mj.id = c.job_id WHERE c.id=%lu AND c.due_remind IS NULL", in["contract_id"].Long())) {
                 // FOR CRON JOBS SET SERVER NAME
-                form.LetStr("server_name", "www.wrenchboard.com");
+                form.LetStr("server_name", "dashboard.wrenchboard.com");
                 vars2form(x, form);
                 form.LetStr("subject", "Task Due Date Approaching");
                 form.LetStr("email", x["email"].c_str());
@@ -897,7 +899,7 @@ long SignupPendingAlertMailfile(CVars in) {
     form.LetStr("site_name", "WrenchBoard");
     form.LetStr("subject", "WrenchBoard Contact Us Alert");
 
-    if (load_db_record(x, "SELECT *,email as email2 FROM members_pending WHERE id = %lu ", in["pending_id"].Long())) {
+    if (load_db_record(x, "SELECT *,email as email2,to_char(expire, 'Day Mon dd, yyyy HH:MI AM') AS expire,to_char(added, 'Day Mon dd, yyyy HH:MI AM') AS added FROM members_pending WHERE id = %lu ", in["pending_id"].Long())) {
         vars2form(x, form);
         form.LetStr("email", out["alertemail"].c_str());
         form.Email("ALERT/alert_signup.mailfile");
@@ -973,7 +975,7 @@ long AccountPendingMail(CVars in) //TESTED
     form.LetStr("site_name", "WrenchBoard");
     form.LetStr("site_trade_name", "Connecting Experts with Clients");
 
-    if (load_db_record(x, "SELECT * FROM members_pending WHERE id = %lu ", in["pending_id"].Long())) {
+    if (load_db_record(x, "SELECT *,to_char(expire, 'Day Mon dd, yyyy HH:MI AM') AS expire FROM members_pending WHERE id = %lu ", in["pending_id"].Long())) {
         vars2form(x, form);
         form.LetStr("email", x["email"].c_str());
         if (x["signup_random"] != "" && x["signup_random"].Long() > 0  &&  in["mobile_email"].Long() == 100) {
@@ -1001,7 +1003,7 @@ long WelcomeAccountMail(CVars in) // TESTED
     C_CGI_Form form("", "");
 
     char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+    form.LetStr("server_name", "https://dashboard.wrenchboard.com");
     form.LetStr("site_name", "WrenchBoard");
 
     if (load_db_record(x, "SELECT * FROM members WHERE id = %lu ", in["member_id"].Long())) {
@@ -1027,7 +1029,7 @@ long JobAddedMail(CVars in) //TESTED
     C_CGI_Form form("", "");
 
     char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+    form.LetStr("server_name", "https://dashboard.wrenchboard.com");
     form.LetStr("site_name", "WrenchBoard");
 
     if (load_db_record(x, "SELECT j.*,j.title as title2,m.email,m.firstname FROM members_jobs j LEFT JOIN members m ON m.id = j.member_id WHERE j.id = %lu AND j.member_id = %lu", in["job_id"].Long(), in["member_id"].Long())) {
@@ -1040,7 +1042,7 @@ long JobAddedMail(CVars in) //TESTED
         vars2form(x, form2);
         out["alertemail"] = CfgReadChar("transnotif.contact");
         char * server_name = getenv("SERVER_NAME");
-        form2.LetStr("server_name", server_name);
+        form2.LetStr("server_name", "https://dashboard.wrenchboard.com");
         form2.LetStr("site_name", "WrenchBoard");
         in["title"] = "Job Added Alert";
         in["message"] = "Job Added Alert";
@@ -1063,7 +1065,7 @@ long CreateWrenchBoardGroupMail(CVars in) {
     C_CGI_Form form("", "");
 
     char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+   form.LetStr("server_name", "https://dashboard.wrenchboard.com");
     form.LetStr("site_name", "WrenchBoard");
 
     if (load_db_record(x, "select g.*,m.email,m.firstname,m.lastname from members_groups g LEFT JOIN members m ON m.id = g.member_id WHERE g.id = %lu ", in["group_id"].Long())) {
@@ -1082,7 +1084,7 @@ long GroupCreateMemberMail(CVars in) {
     C_CGI_Form form("", "");
 
     char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+    form.LetStr("server_name", "https://dashboard.wrenchboard.com");
     form.LetStr("site_name", "WrenchBoard");
 
     if (load_db_record(x, "SELECT gm.*,m.*,e.email FROM group_members gm LEFT JOIN members_groups m ON m.id=gm.group_id LEFT JOIN members e ON e.id=gm.member_id WHERE gm.id = %lu", in["group_member_id"].Long())) {
@@ -1117,7 +1119,7 @@ long EmailCustBalUpdt(CVars in) {
     CVars x;
 
     vars2form(x, form);
-    form.LetStr("site", server_name);
+    form.LetStr("server_name", "https://dashboard.wrenchboard.com");
     form.Email("test.mailfile");
     return 0;
 }
@@ -1209,7 +1211,7 @@ long StartPassResetEmail(CVars in) {
     vars2form(x, form);
 
 
-    form.LetStr("site", server_name);
+   form.LetStr("server_name", "https://dashboard.wrenchboard.com");
     /*
     CREATE TABLE lostpass (
      id serial NOT NULL,
@@ -1245,7 +1247,7 @@ long CompletePassResetEmail(CVars in) {
     vars2form(x, form);
 
 
-    form.LetStr("site", server_name);
+    form.LetStr("server_name", "https://dashboard.wrenchboard.com");
 
 
 
@@ -1296,7 +1298,7 @@ long CustomerAirSalePayment(CVars in) {
         form.LetStr("paymode", "Payment with card");
     }
 
-
+    form.LetStr("server_name", "https://dashboard.wrenchboard.com");
     form.LetStr("site", server_name);
     form.LetStr("email", x["email2"].c_str());
     form.Email("topup_payment.mailfile"); //customer notification

wrenchboard/src/shared_tool/smoney.cc

@@ -10,6 +10,9 @@
 #include "pgsql.h"
 #include "pgsql_wrapper.h"
 #include <curl/curl.h>
+#include "email.h"
+#include "payments.h"
+#include "common_tool.h"
 
 long smoney_calls(CVars in, CVars &out) {
     logfmt(logINFO, "smoney_calls()");
@@ -130,10 +133,14 @@ long member_sendmoney_fee(CVars in, CVars &out) {
 	return  out["processing_fee"].Long();
 }
 
+long WRB_doServiceTransferComplete(CVars in, CVars &out);
+long do_transferPayment(CVars in) ;
+long INTW_configure(CVars in, CVars &out) ;
+
 long member_sendmoney(CVars in, CVars &out) {
     //plog->SetFileName( PREFIX"/logs/member_sendmoney.log" );
     //return INTW_doServiceTransfer(in, out);
-    return -1L;
+    return WRB_doServiceTransferComplete(in, out);
     //return 0;
 }
 
@@ -233,3 +240,365 @@ Referenced by:
 
 
 
+long INTW_configure(CVars in, CVars &out) {
+    logfmt(logINFO, "long INTW_configure(CVars in, CVars &out)");
+    long ret = PHP_API_BAD_PARAM;
+    try {
+        // Configure Interswitch SSL
+
+
+        out["interswitch_ver"] = CfgReadLong("interswitch.version");
+        out["interswitch_sep"] = CfgReadChar("interswitch.soap_endpoint");
+        out["interswitch_tid"] = CfgReadChar("interswitch.terminal_id");
+        out["interswitch_code"] = CfgReadChar("interswitch.entity_code");
+        out["interswitch_mkey"] = CfgReadChar("interswitch.master_key");
+        out["interswitch_pin"] = CfgReadChar("interswitch.pin");
+        out["interswitch_pfix"] = CfgReadChar("interswitch.prefix");
+        out["interswitch_keyf"] = CfgReadChar("interswitch.keyfile");
+        out["interswitch_pass"] = CfgReadChar("interswitch.password");
+        out["interswitch_cert"] = CfgReadChar("interswitch.cacert");
+
+        ret = PHP_API_OK;
+
+    } catch (bad_parameter) {
+
+        out["status"] = "Bad parameter";
+
+    } catch (...) {
+
+        out["status"] = "Unhandled exception in INTW_configure";
+
+    }
+    logfmt(logINFO, "/long INTW_configure(CVars in, CVars &out)");
+    return ret;
+}
+
+
+
+
+
+long do_transferPayment(CVars in) {
+    long ret = PHP_API_BAD_PARAM;
+    CVars out;
+
+    long customer_id = REQ_LONG(in, "customer_id", 1, -1);
+    long transfer_id = REQ_LONG(in, "transfer_id", 1, -1);
+    long payMode = REQ_LONG(in, "mode", 1, -1);
+    long payment_id = 0;
+    long amount = 0;
+    long fee = 0;
+    long total = 0;
+
+
+    /*
+    CREATE TABLE sendmoney_payment
+    (   
+    id serial NOT NULL,	
+    transfer_mode integer NOT NULL,
+    customer_id INT REFERENCES customer(id),
+    transfer_id INT REFERENCES interswitch_money_transfer(id),
+    amount integer DEFAULT 0,
+    fee integer DEFAULT 0,
+    total integer DEFAULT 0,
+    current_balance integer DEFAULT 0,
+    new_balance integer DEFAULT 0,
+    status integer DEFAULT 1,
+    added TIMESTAMP DEFAULT NOW()
+    );
+     */
+
+    ret = load_db_record(out, "SELECT balance FROM members WHERE id = %lu AND status = 1", customer_id);
+    if (ret < 1L) {
+        throw new bad_parameter(out, "senderid");
+    }
+
+    if (payMode == PAYMENT_MODE) {
+        amount = REQ_LONG(in, "amount", 1, -1);
+        fee = REQ_LONG(in, "fee", 1, -1);
+        total = amount + fee; // make sure you are cent here
+
+        if (out["balance"].Long() >= total) // do you have this money
+        {
+            CVars x;
+            x["transfer_mode"] = PAYMENT_MODE;
+            x["transfer_mode"].set_valid(true);
+            x["member_id"] = customer_id;
+            x["member_id"].set_valid(true);
+            x["transfer_id"] = transfer_id;
+            x["transfer_id"].set_valid(true);
+            x["amount"] = amount;
+            x["amount"].set_valid(true);
+            x["fee"] = fee;
+            x["fee"].set_valid(true);
+            x["total"] = total;
+            x["total"].set_valid(true);
+            x["current_balance"] = out["balance"];
+            x["current_balance"].set_valid(true);
+            payment_id = 0;
+
+            out["payment_id"] = insert_db_record(DBS_VALID, "sendmoney_payment", "sendmoney_payment_id_seq", x);
+            char confirmation[20] = "";
+            Confirmation(payment_id, confirmation, sizeof (confirmation));
+
+
+
+
+            ret = PHP_API_BAD_PARAM; // it is still a failure if we get here and did not take the money out of the balance
+
+            CVars y;
+            y["member_id"] = x["member_id"];
+            y["member_id"].set_valid(true);
+            y["sendmoney_id"] = x["transfer_id"];
+            y["sendmoney_id"].set_valid(true);
+            y["code"] = "SMPAY";
+            y["code"].set_valid(true);
+            y["dir"] = DIR_TARGET;
+            y["dir"].set_valid(true);
+            //y["payment_id"] = out["payment_id"];  y["payment_id"].set_valid( true );
+
+            ret = WrenchSendMoneyPayment(y, out);
+
+            if (ret == PHP_CREATED_OK) {
+                load_db_record(out, "SELECT balance AS new_balance FROM members WHERE id = %lu", customer_id);
+                pgsql_exec("UPDATE sendmoney_payment SET new_balance=%lu WHERE id=%lu", out["new_balance"].Long(), out["payment_id"].Long());
+                ret = PHP_API_OK;
+            }
+        }
+    }
+
+    if (payMode == REFUND_MODE) {
+        if (load_db_record(out, "SELECT * FROM sendmoney_payment WHERE transfer_id = %lu AND member_id = %lu", transfer_id, customer_id)) {
+            logfmt(logINFO, "*****WE RE DO VERIFICATION and NO DUPLICATES)");
+            logfmt(logINFO, "**)");
+            logfmt(logINFO, "**)");
+            logfmt(logINFO, "**)");
+            logfmt(logINFO, "**)");
+            logfmt(logINFO, "**)");
+            logfmt(logINFO, "**)");
+            logfmt(logINFO, "**)");
+            logfmt(logINFO, "**)");
+            CVars out;
+            /*REQ_STRING( in, "TransferCode",         3,  30, "(.*)" );
+            REQ_STRING( in, "requestReference",         3,  30, "(.*)" );*/
+
+            //int vRet = INTW_querySendMoneyTransaction(in, out);
+            ret = PHP_API_OK;
+        }
+
+
+    }
+
+    //PAYMENT_MODE
+    //REFUND_MODE
+
+    return ret;
+}
+//*****************************************************************************/
+
+long WRB_doServiceTransferComplete(CVars in, CVars &out) {
+    //plog->SetFileName( PREFIX"/logs/send_money.log" );
+
+    logfmt(logINFO, "long WRB_doServiceTransferComplete(CVars in, CVars &out)");
+    long ret = PHP_API_BAD_PARAM;
+    try {
+
+        out = in;
+        // Initiate interswitch session
+        CVars setup;
+        INTW_configure(in, setup);
+
+
+        in["action"].set_valid(false);
+        REQ_STRING(in, "InitiatingEntityCode", 3, 3, "(.*)");
+        REQ_LONG(in, "InitiatingAmount", 1, -1);
+        REQ_LONG(in, "Fee", 1, -1);
+        REQ_LONG(in, "InitiatingChannel", 1, -1);
+        REQ_STRING(in, "InitiatingPaymentMethodCode", 2, 2, "(.*)");
+        REQ_STRING(in, "InitiatingCurrencyCode", 3, 3, "(.*)");
+        REQ_STRING(in, "TerminatingPaymentMethodCode", 2, 2, "(.*)");
+        REQ_LONG(in, "TerminatingAmount", 1, -1);
+        REQ_STRING(in, "TerminatingCurrencyCode", 3, 3, "(.*)");
+        REQ_STRING(in, "TerminatingCountryCode", 2, 2, "(.*)");
+
+        //REQ_STRING( in, "TerminatingEntityCode",        1,  5, "(.*)" );
+        //REQ_STRING( in, "TerminatingAccountNumber",     1, 50, "(.*)" );
+        //REQ_STRING( in, "TerminatingAccountType",       2,  2, "(.*)" );
+
+        long senderid = REQ_LONG(in, "senderid", 1, -1);
+        long recipientid = REQ_LONG(in, "recipientid", 1, -1);
+
+        in["InitiatingEntityCode"] = "MBA";
+        in["InitiatingEntityCode"].set_valid(true);
+
+
+        CVars sender; // Load sender
+        ret = load_db_record(sender, "SELECT firstname,lastname,balance FROM members WHERE id = %lu AND status = 1", senderid);
+        if (ret < 1L) {
+            throw new bad_parameter(out, "senderid");
+        }
+
+        long LongTotalCost = in["Fee"].Long() + in["TerminatingAmount"].Long() + 0;
+
+        if (sender["balance"].Long() < LongTotalCost) {
+            throw new bad_parameter(out, "insufficient balance for transaction");
+        }
+
+
+
+        CVars recipient; // Load recipient
+        /*recipient["firstname"]  = in["firstname"]; recipient["firstname"].set_valid( true );
+        recipient["lastname"]  = in["lastname"]; recipient["lastname"].set_valid( true );
+        recipient["account_no"]  = in["account_no"]; recipient["account_no"].set_valid( true );
+        recipient["bank_code"]  = in["bank_code"]; recipient["bank_code"].set_valid( true );
+        recipient["account_type"]  = in["account_type"]; recipient["account_type"].set_valid( true );*/
+        ret = load_db_record(recipient, "SELECT firstname,lastname,account_no,bank_code,account_type FROM sendmoney_recipient WHERE id = %lu AND member_id = %lu AND status = 1", recipientid, senderid);
+        if (ret < 1L) {
+            throw new bad_parameter(out, "recipientid");
+        }
+
+        in["TerminatingEntityCode"] = recipient["bank_code"];
+        in["TerminatingEntityCode"].set_valid(true);
+        in["TerminatingAccountNumber"] = recipient["account_no"];
+        in["TerminatingAccountNumber"].set_valid(true);
+        in["transactionID"] = in["transaction_id"];
+        in["transactionID"].set_valid(true);
+
+        CVars inx;
+        inx["Fee"] = in["Fee"];
+        inx["Fee"].set_valid(true);
+        inx["InitiatingAmount"] = in["InitiatingAmount"];
+        inx["InitiatingAmount"].set_valid(true);
+
+        inx["InitiatingChannel"] = in["InitiatingChannel"];
+        inx["InitiatingChannel"].set_valid(true);
+        inx["InitiatingCurrencyCode"] = in["InitiatingCurrencyCode"];
+        inx["InitiatingCurrencyCode"].set_valid(true);
+
+        inx["InitiatingEntityCode"] = in["InitiatingEntityCode"];
+        inx["InitiatingEntityCode"].set_valid(true);
+        inx["InitiatingPaymentMethodCode"] = in["InitiatingPaymentMethodCode"];
+        inx["InitiatingPaymentMethodCode"].set_valid(true);
+
+        inx["TerminatingAccountNumber"] = in["TerminatingAccountNumber"];
+        inx["TerminatingAccountNumber"].set_valid(true);
+        inx["TerminatingAmount"] = in["TerminatingAmount"];
+        inx["TerminatingAmount"].set_valid(true);
+
+        inx["TerminatingCountryCode"] = in["TerminatingCountryCode"];
+        inx["TerminatingCountryCode"].set_valid(true);
+        inx["TerminatingCurrencyCode"] = in["TerminatingCurrencyCode"];
+        inx["TerminatingCurrencyCode"].set_valid(true);
+
+        inx["TerminatingEntityCode"] = in["TerminatingEntityCode"];
+        inx["TerminatingEntityCode"].set_valid(true);
+        inx["TerminatingPaymentMethodCode"] = in["TerminatingPaymentMethodCode"];
+        inx["TerminatingPaymentMethodCode"].set_valid(true);
+
+        inx["recipientid"] = in["recipientid"];
+        inx["recipientid"].set_valid(true);
+        inx["member_id"] = in["senderid"];
+        inx["member_id"].set_valid(true);
+        inx["transactionID"] = in["transactionID"];
+        inx["transactionID"].set_valid(true);
+
+        inx["transfer_code"] = "";
+        inx["transfer_code"].set_valid(true);
+
+
+        out["money_transfer_id"] = insert_db_record(DBS_VALID, "money_transfer", " money_transfer_id_seq", inx);
+        if (out["money_transfer_id"].Long() < 1L) {
+            throw new runtime_error("Failed to create money transfer record");
+        }
+
+        const PGresult *res = pgsql_query("SELECT * FROM money_transfer WHERE id=%lu AND member_id = %lu", out["money_transfer_id"].Long(), in["member_id"].Long());
+        if (res != NULL && pgsql_num_rows(res) > 0) {
+
+        } else {
+            throw new runtime_error("Failed to create money_transfer record");
+        }
+
+        CVars transaction;
+        transaction["detail_id"] = out["money_transfer_id"];
+        transaction["detail_id"].set_valid(true);
+        transaction["type"] = 2L;
+        /* DoTransfer */ transaction["type"].set_valid(true);
+        out["transaction_id"] = insert_db_record(DBS_VALID, "money_transfer_transaction", "money_transfer_transaction_id_seq", transaction);
+        if (out["transaction_id"].Long() < 1L) {
+            throw new runtime_error("Failed to create money_transfer_transaction  record");
+        }
+        CVars transaction_final;
+
+        char xtid[12], uniqueRef[20];
+        memset(uniqueRef, 0, 20);
+        // TransferCode - RequestReference - UniqueRef => request prefix for terminal owner + ID
+        sprintf(uniqueRef, "%s%s000000", setup["interswitch_pfix"].c_str(), out["transaction_id"].c_str());
+        //sprintf( uniqueRef, "%s%-09lu", setup["interswitch_pfix"].c_str(), out["transaction_id"].Long() );
+
+        transaction["transfer_code"] = uniqueRef;
+        transaction["transfer_code"].set_valid(true);
+        transaction_final["transfer_code"] = transaction["transfer_code"];
+        transaction_final["transfer_code"].set_valid(true);
+
+        pgsql_exec("UPDATE money_transfer SET transfer_code='%s' WHERE id=%lu", transaction_final["transfer_code"].c_str(), out["money_transfer_id"].Long());
+
+        //sprintf( xtid, "%s", setup["interswitch_tid"].c_str() );
+        sprintf(xtid, "%s", setup["interswitch_tid"].c_str());
+
+
+        //in["SenderEmail"] = sender["email"]; in["SenderEmail"].set_valid(true);
+        //in["BeneficiaryEmail"] = recipient["email"]; in["BeneficiaryEmail"].set_valid(true);
+
+        //*TAKE THE MONEY NOW
+        CVars pm;
+        pm["customer_id"] = senderid;
+        pm["customer_id"].set_valid(true);
+        pm["transfer_id"] = out["money_transfer_id"];
+        pm["transfer_id"].set_valid(true);
+        pm["amount"] = in["InitiatingAmount"];
+        pm["amount"].set_valid(true);
+        pm["fee"] = in["Fee"];
+        pm["fee"].set_valid(true);
+        pm["mode"] = PAYMENT_MODE;
+        pm["mode"].set_valid(true);
+
+        /*
+        #define SM_PENDING 1
+        #define SM_CANCEL  3
+        #define SM_FAILED  4
+        #define SM_COMPLETED 5
+         */
+        if (do_transferPayment(pm) == PHP_API_OK) {
+            out["sendmoney_status"] = SM_PENDING;
+            in["sendmoney_id"] = out["money_transfer_id"];
+			ret = PHP_API_OK;
+            sendmoney_email(SM_PENDING, in, out);
+            // all is good on money side
+            logfmt(logINFO, "*** ALL Good ------ ****** ");
+        } else {
+            out["sendmoney_status"] = SM_FAILED;
+            throw new runtime_error("Failed to create payment record");
+        }
+
+        load_db_record(out, "SELECT m.*,mp.confirmation,r.firstname||' '||r.lastname  AS Recitient,r.account_no,b.name AS bank_name  FROM money_transfer m LEFT JOIN members_payments mp ON mp.what_sendmoney = m.id LEFT JOIN sendmoney_recipient r ON r.id = m.recipientid LEFT JOIN bank_entity_codes b ON b.code = r.bank_code WHERE m.id=%lu", out["money_transfer_id"].Long());
+
+    } catch (runtime_error& ex) {
+
+        out["status"] = ex.what();
+        ret = PHP_API_BAD_PARAM;
+
+    } catch (bad_parameter) {
+
+        out["status"] = "Invalid input";
+        ret = PHP_API_BAD_PARAM;
+
+    } catch (...) {
+
+        out["status"] = "Unhandled exception in INTW_doTransfer";
+        ret = PHP_API_BAD_PARAM;
+
+    }
+
+    logfmt(logINFO, "/long INTW_doTransfer(CVars in, CVars &out)");
+    return ret;
+
+}

www/TEST/i.php

@@ -1,4 +1,67 @@
-<?
+<?php
+/*
+$ar1 = [
+"color" => "red",  
+"sex" => "male",
+];
+
+
+$ar2 =  ["color" => "green",  ];
+$result = array_merge_recursive($ar1, $ar2);
+print_r($result);*/
+print_r( spaTranslationsCall());
+
+
+    function spaTranslationsCall()
+    {
+        return  array_merge_recursive(spaTranslations(),[
+        'hide_boards' => 'Hide Boards',
+        'draw_numbers' => 'Draw Number(s)',
+        'next_draw' => 'Next Draw',
+        ]);
+
+    }
+	
+	
+	 function spaTranslations(){
+        return [
+            'cart_title' => 'Below you can review and adjust the games you have added',
+            'cart_subtitle' => 'Select a row to see more details',
+            'cart_empty' => 'Your cart is empty.',
+            'cart_summary_title' => 'Below are the entries you purchased!',
+            'cart_summary_title_fail' => 'Your transaction could not be completed, please try again.',
+            'cart_summary_title_some_fail' => 'Some tickets could not be played, please return to cart and try again.',
+            'show_boards' => 'Expand to display boards',
+            'board' => 'Board',
+            'week' => 'Week',
+            'current_shopping_cart_total' => 'Your current Shopping Cart total is',
+            'subtotal' => 'Subtotal',
+            'discount' => 'Discount',
+            'voucher_discount' => 'Voucher Discount',
+            'total' => 'Total',
+            'clear_cart_confirmation' => 'Do you realy want to empty your cart?',
+            'cart_delete_confirmation' => 'Do you really want to delete this cart item?',
+            'number_of_draws' => 'Multi draws',
+            'ticket_update' => 'Update Ticket',
+            'ticket_updated' => 'Your ticket was Updated, return to cart to replay.',
+            'ticket_id' => 'Ticket ID',
+            'wager_id' => 'Wager ID',
+            'next_draw' => 'Next draw',
+            'btn_continue_playing' => 'Continue Playing',
+            'cart_draw_date' => 'Date',
+            'details_date_at' => 'at',
+            'details_date_from' => 'from',
+            'details_date_to' => 'to',
+            'no_of_draws' => 'No of Draws',
+            'handling_fee' => 'Handling Fee',
+            'price_details_title' => 'Price Details',
+            'cart_item_price' => 'Price',
+            'details_total' => 'Total',
+            'system_played' => 'System',
+        ];
+    }
+
+
 $USER = $_SERVER['SCRIPT_FILENAME'];
 $USER = str_replace('/home', '', $USER);
 $USER = strtok($USER, '/');
@@ -7,6 +70,6 @@ $USER = strtok($USER, '/');
 $wrenchboard_class = 'wrenchboard_api_' . $USER . '\\WrenchBoard';
 $wrenchboard = new $wrenchboard_class();
 $ret = $wrenchboard->wrenchboard_api($in,$out);
-var_dump($ret);
+//var_dump($ret);
-phpinfo();
+//phpinfo();
 ?>

www/TEST/login.php

@@ -11,13 +11,14 @@ $wrenchboard = new $wrenchboard_class();
 
 
 
-Array ( [title] => Re:Week 1 CAT 2: “Muddiest” Point [description] => sffss [timeline] => 3 [job_detail] => sgsagsagashas [price] => 5000 [action] => 0 ) 
+//Array ( [title] => Re:Week 1 CAT 2: “Muddiest” Point [description] => sffss [timeline] => 3 [job_detail] => sgsagsagashas [price] => 5000 [action] => 0 ) 
     
     
     $data['firstname'] = 'Olu';
     $data['lastname'] = 'Amey';
     
     $email = 'ses66181+1@gmail.com';
+    $email = 'acidumirae@gmail.com';
     $data['email'] = $email;
     $data['username'] = $email;
     $data['password'] = 'may12002';

www/TEST/test_createuser.php

@@ -3,9 +3,11 @@
 require_once 'config.php';
 $url = $local_url . "/createuser";
 
-$username = urlencode("ses66181+" . rand(1000, 9999) . "@gmail.com");
+$username = urlencode("jubaworker+" . rand(1000, 9999) . "@gmail.com");
 
-$username = "ses66181+" . rand(1000, 9999) . "@gmail.com";
+$username = "jubaworker+" . rand(1000, 9999) . "@gmail.com";
+//$username = "ameye+" . rand(1000, 9999) . "@chiefsoft.com";
+//$username = "ses66181+" . rand(1000, 9999) . "@gmail.com";
 $phone = (rand(1, 2) > 1) ? "770222" . rand(2222, 9999) : '';
 
 include 'sample_data.php'; // just for sample data

www/application/config/constants.php

@@ -92,7 +92,7 @@ define('PHP_API_OK', 0);
 define('PHP_LOGIN_OK', 100);
 define('PHP_CREATED_OK', 10);
 define('PHP_API_BAD_PARAM', -1);
-define('SESSION_TIMEOUT_LOGOUT',72000);
+define('SESSION_TIMEOUT_LOGOUT',144000);
 
 define('SUPPORT_PHONE','+234 (818)-3866434');
 
@@ -269,3 +269,7 @@ define('PAY_MODE_BONUS', 9);
 define('APPROVED_BALANCE', 5);
 define('DISAPROVE_BALANCE', 3);
 
+
+define('WRENCHBOARD_USER_SENDMONEY',   11051);
+
+

www/application/config/routes.php

@@ -49,7 +49,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 | Examples:	my-controller/index	-> my_controller/index
 |		my-controller/my-method	-> my_controller/my_method
 */
-$route['default_controller'] = 'site';
+$route['default_controller'] = 'login';
 $route['404_override'] = 'Wrb404';
 $route['translate_uri_dashes'] = FALSE;
 

www/application/controllers/Bkotransaction.php

@@ -25,7 +25,8 @@ class Bkotransaction extends Bko_Controller {
                 $mysql = "SELECT m.id,mp.confirmation, m.added,me.firstname||' '||me.lastname||'<br>'||me.email  AS Sender,"
                         . "sr.firstname||' '||sr.lastname||'<br>ACC:'||sr.account_no||'-'||be.name AS recipient, m.initiatingamount*0.01 AS Amount,m.fee*0.01 AS Fee, "
                         . "'<input type=submit id=\"accs'||m.id||'\"  onclick=\"return smoneyDetail('||m.id||')\"  name=\"manage\" class=\"btn btn-info btn-sm\" value=\"Detail\">' As Detail, "
-                        . "'<input type=submit id=\"acc'||m.id||'\" onclick=\"return smoneyProcess('||m.id||')\"  name=\"manage\" class=\"btn btn-info btn-sm\" value=\"Process\">' As Process "
+                        . "'<input type=submit id=\"acc'||m.id||'\" onclick=\"return smoneyProcess('||m.id||')\"  name=\"manage\" class=\"btn btn-info btn-sm\" value=\"Process\">' As Process, "
+                        . "m.initiatingamount AS raw_amount, m.fee AS raw_fee, sr.bank_code, sr.account_no "
                         . "FROM money_transfer m "
                         . "LEFT JOIN members me ON me.id=m.member_id "
                         . "LEFT JOIN sendmoney_recipient sr ON sr.id=m.recipientid "
@@ -39,7 +40,7 @@ class Bkotransaction extends Bko_Controller {
 
                 break;
 
-                        case 'TRANSDETAIL':
+            case 'TRANSDETAIL':
 
                       $mysql = "SELECT m.id,mp.confirmation, m.added,me.firstname||' '||me.lastname||'<br>'||me.email  AS Sender,"
                         . "sr.firstname||' '||sr.lastname||'<br>ACC:'||sr.account_no||'-'||be.name AS recipient, m.initiatingamount*0.01 AS Amount,m.fee*0.01 AS Fee "
@@ -65,93 +66,155 @@ class Bkotransaction extends Bko_Controller {
 
             case 'COMPLETE':
                 //echo 'complete 1';
-// url: "/bkotransaction/smprocess?proc=COMPLETE&sendmoney_id="+link_id+'&tcode='+tcode+'&tref='+tref
+                // url: "/bkotransaction/smprocess?proc=COMPLETE&sendmoney_id="+link_id+'&tcode='+tcode+'&tref='+tref
                 $data["trans_code"] = $this->input->get('tcode');
                 $data["trans_tref"] = $this->input->get('tref');
                 $data["sendmoney_id"] = $sendmoney_id;
-                $data['action'] = WRENCHBOARD_SMONEY_BKOPROC;
+                echo $this->sendmoneyCompletePage($data);
-                $data['action_mode'] = SMONEY_PROCC_MANUAL;
-                $this->load->model('backend_model');
-                $out = array();
-                $this->backend_model->wrenchboard_api($data, $out);
-                echo $out['status'];
-
-
 
                 break;
         }
     }
+        protected function sendmoneyCompletePage($data) {
+            $data['action'] = WRENCHBOARD_SMONEY_BKOPROC;
+            $data['action_mode'] = SMONEY_PROCC_MANUAL;
+            $this->load->model('backend_model');
+            $out = array();
+            $this->backend_model->wrenchboard_api($data, $out);
+            return $out['status'];
+        }
 
     
         public function smTransmitProcess() {
-        //    url: "/bkotransaction/smprocess?proc=PROCESS&sendmoney_id="+link_id
+            //    url: "/bkotransaction/smprocess?proc=PROCESS&sendmoney_id="+link_id
-        $proc = $this->input->get('proc');
+            $proc = $this->input->get('proc');
-        $sendmoney_id = $this->input->get('sendmoney_id');
+            $sendmoney_id = $this->input->get('sendmoney_id');
 
-        switch ($proc) {
+            switch ($proc) {
-            case 'PROCESS':
+                case 'PROCESS':
-                $mysql = "SELECT m.id,mp.confirmation, m.added,me.firstname||' '||me.lastname||'<br>'||me.email  AS Sender,"
+                    $mysql = "SELECT m.id,mp.confirmation, m.added,me.firstname||' '||me.lastname||'<br>'||me.email  AS Sender,"
-                        . "sr.firstname||' '||sr.lastname||'<br>ACC:'||sr.account_no||'-'||be.name AS recipient, m.initiatingamount*0.01 AS Amount,m.fee*0.01 AS Fee, "
+                            . "sr.firstname||' '||sr.lastname||'<br>ACC:'||sr.account_no||'-'||be.name AS recipient, m.initiatingamount*0.01 AS Amount,m.fee*0.01 AS Fee, "
-                        . "'<input type=submit id=\"accs'||m.id||'\"  onclick=\"return smoneyDetail('||m.id||')\"  name=\"manage\" class=\"btn btn-info btn-sm\" value=\"Detail\">' As Detail, "
+                            . "'<input type=submit id=\"accs'||m.id||'\"  onclick=\"return smoneyDetail('||m.id||')\"  name=\"manage\" class=\"btn btn-info btn-sm\" value=\"Detail\">' As Detail, "
-                        . "'<input type=submit id=\"acc'||m.id||'\" onclick=\"return smoneyProcess('||m.id||')\"  name=\"manage\" class=\"btn btn-info btn-sm\" value=\"Process\">' As Process "
+                            . "'<input type=submit id=\"acc'||m.id||'\" onclick=\"return smoneyProcess('||m.id||')\"  name=\"manage\" class=\"btn btn-info btn-sm\" value=\"Process\">' As Process, "
-                        . "FROM money_transfer m "
+                            . "m.initiatingamount AS raw_amount, m.fee AS raw_fee, sr.bank_code, sr.account_no "
-                        . "LEFT JOIN members me ON me.id=m.member_id "
+                            . "FROM money_transfer m "
-                        . "LEFT JOIN sendmoney_recipient sr ON sr.id=m.recipientid "
+                            . "LEFT JOIN members me ON me.id=m.member_id "
-                        . "LEFT JOIN members_payments mp ON mp.what_sendmoney = m.id "
+                            . "LEFT JOIN sendmoney_recipient sr ON sr.id=m.recipientid "
-                        . "LEFT JOIN bank_entity_codes be ON be.code=sr.bank_code WHERE m.id=" . $sendmoney_id;
+                            . "LEFT JOIN members_payments mp ON mp.what_sendmoney = m.id "
+                            . "LEFT JOIN bank_entity_codes be ON be.code=sr.bank_code WHERE m.id=" . $sendmoney_id;
 
-                $query = $this->db->query($mysql);
+                    $query = $this->db->query($mysql);
-                $row = $query->row_array();
+                    $row = $query->row_array();
 
-                echo $this->sendmoneyProcessPage($row);
+                    echo $this->sendmoneyProcessPage($row);
 
-                break;
+                    break;
 
-            case 'DETAIL':
+                case 'DETAIL':
 
-                echo 'detail';
+                    echo 'detail';
 
-                break;
+                    break;
 
-            case 'TRANSMIT':
+                case 'TRANSMIT':
-                //echo 'complete 1';
+                    //echo 'complete 1';
-// url: "/bkotransaction/smprocess?proc=COMPLETE&sendmoney_id="+link_id+'&tcode='+tcode+'&tref='+tref
+                    // url: "/bkotransaction/smprocess?proc=COMPLETE&sendmoney_id="+link_id+'&tcode='+tcode+'&tref='+tref
-                $data["trans_code"] = $this->input->get('tcode');
+                    $data["trans_code"] = $this->input->get('tcode');
-                $data["trans_tref"] = $this->input->get('tref');
+                    $data["trans_tref"] = $this->input->get('tref');
-                $data["sendmoney_id"] = $sendmoney_id;
+                    $data["sendmoney_id"] = $sendmoney_id;
-                $data['action'] = WRENCHBOARD_SMONEY_BKOPROC;
+                    $mysql = "SELECT m.id,mp.confirmation, m.added,me.firstname||' '||me.lastname||'<br>'||me.email  AS sender,
-                $data['action_mode'] = SMONEY_PROCC_INTERSWITCH;
+                    sr.firstname||' '||sr.lastname||'<br>ACC:'||sr.account_no||'-'||be.name AS recipient, 
-                $this->load->model('backend_model');
+                    m.initiatingamount*0.01 AS amount, m.fee*0.01 AS fee,
-                $out = array();
+                    m.initiatingamount AS raw_amount, m.fee AS raw_fee, sr.bank_code, sr.account_no 
-                $this->backend_model->wrenchboard_api($data, $out);
+                                  FROM money_transfer m 
-                echo $out['status'];
+                                  LEFT JOIN members me ON me.id=m.member_id 
-
+                                  LEFT JOIN sendmoney_recipient sr ON sr.id=m.recipientid 
-
+                                  LEFT JOIN members_payments mp ON mp.what_sendmoney = m.id 
-
+                                  LEFT JOIN bank_entity_codes be ON be.code=sr.bank_code WHERE m.id=" . $sendmoney_id;
-                break;
+    
+                    $query = $this->db->query($mysql);
+                    $row = $query->row_array();
+    
+                    echo $this->sendmoneyProcessPage($row, $data);
+                    /*
+                    $data['action'] = WRENCHBOARD_SMONEY_BKOPROC;
+                    $data['action_mode'] = SMONEY_PROCC_INTERSWITCH;
+                    $this->load->model('backend_model');
+                    $out = array();
+                    $this->backend_model->wrenchboard_api($data, $out);
+                    echo $out['status'];
+                    */
+                    break;
+            }
         }
-    }
     
     
         private function TransmitSendmoneyProcessPage($out) {
 
-        $myTable = "<form id='sendmoneyProcessPage" . $out['id'] . "' name='sendmoneyProcessPage" . $out['id'] . "'><table class='table table-striped table-hover table-bordered table-condensed'>";
+            $myTable = "<form id='sendmoneyProcessPage" . $out['id'] . "' name='sendmoneyProcessPage" . $out['id'] . "'><table class='table table-striped table-hover table-bordered table-condensed'>";
-        $myTable .="<tr><td style='width:100px;'><b>Confirmation</b></td><td>" . $out['confirmation'] . "</td></tr>";
+            $myTable .="<tr><td style='width:100px;'><b>Confirmation</b></td><td>" . $out['confirmation'] . "</td></tr>";
-        $myTable .="<tr><td style='width:100px;'><b>Trx. Date</b></td><td>" . $out['added'] . "</td></tr>";
+            $myTable .="<tr><td style='width:100px;'><b>Trx. Date</b></td><td>" . $out['added'] . "</td></tr>";
-        $myTable .="<tr><td style='width:100px;'><b>Sender</b></td><td>" . $out['sender'] . "</td></tr>";
+            $myTable .="<tr><td style='width:100px;'><b>Sender</b></td><td>" . $out['sender'] . "</td></tr>";
-        $myTable .="<tr><td style='width:100px;'><b>Recipient</b></td><td>" . $out['recipient'] . "</td></tr>";
+            $myTable .="<tr><td style='width:100px;'><b>Recipient</b></td><td>" . $out['recipient'] . "</td></tr>";
-        $myTable .="<tr><td style='width:100px;'><b>Amount</b></td><td>" . $out['amount'] . "</td></tr>";
+            $myTable .="<tr><td style='width:100px;'><b>Amount</b></td><td>" . $out['amount'] . "</td></tr>";
-        $myTable .="<tr><td style='width:100px;'><b>Fee</b></td><td>" . $out['fee'] . "</td></tr>";
+            $myTable .="<tr><td style='width:100px;'><b>Fee</b></td><td>" . $out['fee'] . "</td></tr>";
-       
+        
-        $myTable .="<tr><td style='width:100px;'><b></b></td><td></td></tr>";
+            $myTable .="<tr><td style='width:100px;'><b></b></td><td></td></tr>";
-        $myTable .="</table></form> ";
+            $myTable .="</table></form> ";
 
-        return $myTable;
+            return $myTable;
-    }
+        }
     
-    private function sendmoneyProcessPage($out) {
+    private function sendmoneyProcessPage($out, $page=array()) {
+        $data = array(
+            "account_bank" => $out['bank_code'],
+            "account_number" => $out['account_no'],
+            "amount" => $out['raw_amount'],
+            "narration" => $out['sender'],
+            "currency" => "NGN",
+            "reference" => $out['id'],
+            "debit_currency" => "NGN"
+        );
+        $url = "http://localhost:3000/create";
+        $ch = curl_init();
+        curl_setopt($ch,CURLOPT_URL, $url);
+        curl_setopt($ch,CURLOPT_POST, count($data));
+        curl_setopt($ch,CURLOPT_POSTFIELDS, json_encode($data));
+        curl_setopt($ch,CURLOPT_HTTPHEADER, array('Content-Type:application/json'));
+        curl_setopt($ch,CURLOPT_RETURNTRANSFER, TRUE);
+        $result = curl_exec($ch);
+        curl_close($ch);
 
-        $myTable = "<form id='sendmoneyProcessPage" . $out['id'] . "' name='sendmoneyProcessPage" . $out['id'] . "'><table class='table table-striped table-hover table-bordered table-condensed'>";
+        $data = json_decode($result, true);
+        // Error
+        // {"status":"failure","message":"Invalid response","details":"Request failed with status code 400","code":400,"data":{"status":"error","code":"UNAUTHORIZED_ACCESS","message":"Unauthorized access. Compliance approval required to use this feature"}}
+        // Success
+        // ???
+        $page["message"] = "";
+        if ($data == null || $data == "" || (array_key_exists("status",$data) && $data["status"]=="failure")) {
+            if ($data == null || $data == "") {
+                // Invalid response, not clear what is going on (non-JSON response from the payment API)
+                $page["message"] = "Invalid payment API respose: ".htmlentities($result); 
+            } else if (array_key_exists("data",$data) && array_key_exists("message",$data["data"])) {
+                // Payment processor message
+                $page["message"] = $data["data"]["message"]; 
+            } else if (array_key_exists("message",$data)) {
+                // Payment API message
+                $page["message"] = $data["message"]; 
+            } else {
+                // Not clear what is going on (failure with no messages?)
+                $page["message"] = "Invalid payment API respose: ".htmlentities($result);
+            }
+        } else {
+            // TODO: success
+        }
+        // $page['confirmation']
+        // $page['trans_code']
+        // $data['trans_tref']
+
+        $myTable = "<form id='sendmoneyProcessPage" . $out['id'] . "' name='sendmoneyProcessPage" . $out['id'] . "'>";
+        $myTable .="<span style='font-weight:bold;color:red'>".$page["message"]."</span>";
+        $myTable .="<table class='table table-striped table-hover table-bordered table-condensed'>";
         $myTable .="<tr><td style='width:100px;'><b>Confirmation</b></td><td>" . $out['confirmation'] . "</td></tr>";
         $myTable .="<tr><td style='width:100px;'><b>Trx. Date</b></td><td>" . $out['added'] . "</td></tr>";
         $myTable .="<tr><td style='width:100px;'><b>Sender</b></td><td>" . $out['sender'] . "</td></tr>";

www/application/controllers/Dash.php

@@ -87,82 +87,68 @@ class Dash extends Users_Controller {
             $this->table->set_heading(array('data' => 'Job', 'style' => 'width:180px'), 'Title/Description', array('data' => '', 'style' => 'width:100px; cellpadding:0px;'));
 
             $data['job_table'] = $this->table->generate($query);
-
+            $data['job_table_result'] = $query->result(); // used in new impl.
 
             $x = $this->dashTaskMessage();
             $data['job_message_table'] = $x['job_message_table'];
+            $data['job_message_table_result'] = $x['job_message_table_result'];
+            $data['message_found'] = $x['message_found'];
             /// End table data ===========================
 
 
-
+            $acp = array();
-            /*
+            $acp =  $this->activeProjects();
-              $this->load->library('table');
+            $data['job_table'] =  $acp['job_table'];
-              $this->table->set_template($this->template);
+            $data['job_table_result'] =  $acp['job_table_result'];
-              //$this->table->set_heading('Job', 'Client', 'Terms', 'Description', 'Manage', 'Status');
-              $mysql = 'SELECT jo.added::date,jo.member_id,j.title,'
-              . 'CASE WHEN jo.status = 1 THEN \'Pending\' ELSE \'Other\' END AS status'
-              . 'FROM members_jobs_offer jo LEFT JOIN members_jobs j ON j.id = jo.job_id LIMIT 5';
-              // $sqb =" ,'<button type=\"button\" class=\"btn btn-primary btn-xs\">View</button>' As View ";
-              $jbx = "''jobs/viewjob''";
-              $mysql = "SELECT jo.added::date,j.title,"
-              . 'CASE WHEN jo.status = 1 THEN \'Pending\' ELSE \'Other\' END AS status,'
-              . "'<input type=submit onclick=\"return post_nav_find_action($jbx,'''||jo.offer_code||''')\"  name=\"manage\" class=\"btn btn-primary btn-xs\" value=\"View\">' AS View  "
-              . "FROM members_jobs_offer jo LEFT JOIN members_jobs j ON j.id = jo.job_id "
-              . "WHERE jo.expire > now() AND jo.status = 1 "
-              . "AND jo.client_id = " . $_SESSION['member_id'] . "LIMIT 4";
-
-              $query = $this->db->query($mysql);
-
-              $num = $query->num_rows();
-
-              $data["dash_title"] = "Pending Offer(s)";
-              if ($num > 0) {
-              $this->table->set_heading('Added', 'Title', 'Status', '');
-              $data['offer_dash'] = $this->table->generate($query);
-              } else {
-              $data["offer_dash"] = "<div class=\"thumb\"><img src='assets/images/notask.png' alt=\"Active Projects\"></div>";
-              }
-             */
 
             $ya = array();
             $ya = $this->dash_title();
             $data["dash_title"] = $ya["dash_title"];
             $data["offer_dash"] = $ya["offer_dash"];
+            $data["offer_dash_result"] = $ya["offer_dash_result"];
+            $data["offer_found"] = $ya["offer_found"];
 
             $_SESSION['secure_data'] = $data; // all data needed for secure page
-            // print_r($_SESSION);
+//var_dump( $_SESSION);
+//exit;
+         $data['page_title'] ="Dashboard";
+        $this->renderSecurePage('users/view_dash', $data);
 
-            $this->load->view('users/view_header_user', $data);
+    }
-            $this->load->view('users/view_dash', $data);
-            $this->load->view('users/view_footer_user', $data);
-        }
     }
 
+
+    private function activeProjects(){
+
+
+        $jbx = "''/proj/thisjob''";
+        $mysql = "SELECT  '<b>ID:</b><a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br><b>Timeline:</b>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01  AS Project,"
+            . " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id,"
+            . " (CASE WHEN mc.status=4 THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\"  name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"Review\">' "
+            . " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\"  name=\"manage\" class=\"btn btn-success btn-xs btn-block\" value=\"View\">' "
+            . " WHEN mc.status = 1 AND mc.delivery_date <now() THEN '<span class=\"label label-flat border-danger text-danger-600\">PastDue</span>' "
+            . " ELSE '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\"  name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"View\">' END)  AS manage "
+            . " FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id  "
+            . " WHERE mc.member_id = " . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) AND mc.delivery_date > now() "
+            . " OR mc.client_id =" . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) AND mc.delivery_date > now() LIMIT 4";
+
+        $query = $this->db->query($mysql);
+
+
+        $this->load->library('table');
+        $this->table->set_template($this->template);
+        $this->table->set_heading(array('data' => 'Job', 'style' => 'width:180px'), 'Title/Description', array('data' => '', 'style' => 'width:100px; cellpadding:0px;'));
+
+        $data['job_table'] = $this->table->generate($query);
+        $data['job_table_result'] = $query->result(); // used in new impl.
+
+        return $data;
+
+    }
     private function dashTaskMessage() {
         $data = array();
-        /*
-          wrenchboard=> select s.created,j.contract,j.title,j.id,j.status,j.delivery_date,substring(s.message,0,100) FROM members_jobs_contract j RIGHT JOIN jobs_contract_message s ON s.contract=j.contract  WHERE j.member_id=3 or j.client_id = 3 AND j.status IN (1,4);
-          created           |  contract  |                     title                     | id | status |       delivery_date        |                                              substring
-          ----------------------------+------------+-----------------------------------------------+----+--------+----------------------------+-----------------------------------------------------------------------------------------------------
-          2017-05-18 11:53:20.569399 | 7BW9B9R8BB | five thousand naira                           | 13 |      1 | 2017-08-02 14:19:38.711257 | This is a test of ajax send message
-          2017-05-18 12:03:30.685328 | 7B27RRBRB7 | 595Job Title Job Title Job Title Job Title932 | 15 |      4 | 2017-05-10 19:23:26.115394 | dldldldldldl
-          2017-05-18 12:03:44.137005 | 7B27RRBRB7 | 595Job Title Job Title Job Title Job Title932 | 15 |      4 | 2017-05-10 19:23:26.115394 | This is an empty list test
-          2017-05-18 12:04:00.228586 | 7B27RRBRB7 | 595Job Title Job Title Job Title Job Title932 | 15 |      4 | 2017-05-10 19:23:26.115394 | List should be populated now
-          2017-05-18 20:49:12.996077 | 7BW9B9R8BB | five thousand naira                           | 13 |      1 | 2017-08-02 14:19:38.711257 | About PayQuic\r                                                                                    +
-          |            |                                               |    |        |                            | PayQuic is global payments and airtime top-up company. Open for business 24/7, 365 d
-          2017-06-12 10:28:32.720786 | 601BBWRW48 | 595Job Title Job Title Job Title Job Title932 | 10 |      1 | 2017-08-09 16:08:43.503739 | <table><tbody><tr><td><div><span><br>can you share your controller method and did you tried&nbsp;<c
-          2017-06-12 10:28:41.932836 | 601BBWRW48 | 595Job Title Job Title Job Title Job Title932 | 10 |      1 | 2017-08-09 16:08:43.503739 | <table><tbody><tr><td><div><span><br>can you share your controller method and did you tried&nbsp;<c
-
-         */
         $jbx = "''/proj/thisjob''";
-
+        $mysql = " SELECT s.created::date ||'<br>'||j.contract AS date_contract,j.title AS title,substring(s.message,0,90) as title_message,'\/proj\/thisjob' AS qpath,j.id AS offer_code,"
-        $mysql = " SELECT s.created,j.contract,j.title,j.id,j.status,j.delivery_date,substring(s.message,0,100),"
-                . " '<input type=submit onclick=\"return post_nav_find_action($jbx, '||j.id||')\"  name=\"manage\" class=\"btn btn-success btn-xs btn-block\" value=\"View\">' "
-                . " FROM members_jobs_contract j "
-                . " RIGHT JOIN jobs_contract_message s ON s.contract=j.contract  "
-                . " WHERE j.member_id=" . $_SESSION['member_id'] . " OR j.client_id = " . $_SESSION['member_id'] . " AND j.status IN (1,4)";
-
-        $mysql = " SELECT s.created::date ||'<br>'||j.contract AS date_contract,'<b>Title:</b>'||j.title||'<br>'||substring(s.message,0,90) as title_message,"
                 . " '<input type=submit onclick=\"return post_nav_find_action($jbx, '||j.id||')\"  name=\"manage\" class=\"btn btn-success btn-xs btn-block\" value=\"View\">' "
                 . " FROM members_jobs_contract j "
                 . " RIGHT JOIN jobs_contract_message s ON s.contract=j.contract  "
@@ -170,13 +156,13 @@ class Dash extends Users_Controller {
 
         $query = $this->db->query($mysql);
 
-
         $this->load->library('table');
         $this->table->set_template($this->template);
         $this->table->set_heading(array('data' => 'Date', 'style' => 'width:180px'), 'Title/Message', array('data' => '', 'style' => 'width:100px; cellpadding:0px;'));
 
         $data['job_message_table'] = $this->table->generate($query);
-
+        $data['job_message_table_result'] = $query->result(); // used in new impl.
+        $data['message_found'] =  true;
         return $data;
     }
 
@@ -185,21 +171,19 @@ class Dash extends Users_Controller {
         $offer_found = false;
 
         $data = array();
-        $data['offer_dash'] = '';
+        $data['offer_dash'] = $data['offer_dash_result']  ='';
         $this->load->library('table');
         $this->table->set_template($this->template);
 
         $jbx = "''/jobs/viewjob''";
-        $mysql = "SELECT jo.added::date,j.title,"
+        $mysql = "SELECT jo.added::date AS pdate,j.title,(CASE WHEN jo.public_view > 0 THEN '-Public View' ELSE jo.email END)  AS tRec,'\/jobs\/viewjob' AS qpath,"
-                . "'<input type=submit onclick=\"return post_nav_find_action($jbx,'''||jo.offer_code||''')\"  name=\"manage\" class=\"btn btn-primary btn-xs\" value=\"View\">' AS View  "
+                . 'CASE WHEN jo.status = 1 AND jo.public_view =0 THEN \'Pending\' WHEN jo.status = 1 AND jo.public_view >0 THEN \'Active\'  ELSE \'Other\' END AS status,'
+                . "'<input type=submit onclick=\"return post_nav_find_action($jbx,'''||jo.offer_code||''')\"  name=\"manage\" class=\"btn btn-primary btn-xs\" value=\"View\">' AS View ,jo.offer_code AS offer_code "
                 . "FROM members_jobs_offer jo LEFT JOIN members_jobs j ON j.id = jo.job_id "
                 . "WHERE jo.expire > now() AND jo.status = 1 "
                 . "AND jo.client_id = " . $_SESSION['member_id'] . " LIMIT 4";
-//  . 'CASE WHEN jo.status = 1 THEN \'Pending\' ELSE \'Other\' END AS status,'
         $query = $this->db->query($mysql);
-
         $num = $query->num_rows();
-
         $data["dash_title"] = "Pending Offer(s)";
         if ($num > 0) {
 
@@ -209,6 +193,7 @@ class Dash extends Users_Controller {
 
             $this->table->set_heading(array('data' => 'Added', 'style' => 'width:80px'), 'Title', array('data' => '', 'style' => 'width:80px'));
             $data['offer_dash'] = $this->table->generate($query);
+            $data['offer_dash_result'] = $query->result();
             $offer_found = true;
         } else {
             $data["offer_dash"] = "<div class=\"thumb\"><img src='assets/images/notask.png' alt=\"Active Projects\"></div>";
@@ -218,15 +203,14 @@ class Dash extends Users_Controller {
         if ($offer_found == false) {
             $data["dash_title"] = "<a href='/jobs/pendingoffer'>My Pending Offer(s)</a>";
             $jbx = "''/jobs/viewmyjob''";
-            $mysql = "SELECT jo.added::date||'<br>'||jo.expire::date,j.title||'<br><b>To :</b>'||(CASE WHEN jo.public_view > 0 THEN '-Public View' ELSE jo.email END)  AS tRec,"
+            $mysql = "SELECT jo.added::date||'<br>'||jo.expire::date AS pdate,j.title, (CASE WHEN jo.public_view > 0 THEN '-Public View' ELSE jo.email END)  AS tRec,'\/jobs\/viewmyjob' AS qpath,"
                     . 'CASE WHEN jo.status = 1 AND jo.public_view =0 THEN \'Pending\' WHEN jo.status = 1 AND jo.public_view >0 THEN \'Active\'  ELSE \'Other\' END AS status,'
-                    . "'<input type=submit onclick=\"return post_nav_find_action($jbx,'''||jo.offer_code||''')\"  name=\"manage\" class=\"btn btn-primary btn-xs\" value=\"View\">' AS View  "
+                    . "'<input type=submit onclick=\"return post_nav_find_action($jbx,'''||jo.offer_code||''')\"  name=\"manage\" class=\"btn btn-primary btn-xs\" value=\"View\">' AS View,jo.offer_code AS offer_code  "
                     . "FROM members_jobs_offer jo LEFT JOIN members_jobs j ON j.id = jo.job_id "
                     . "WHERE jo.expire > now() AND jo.status = 1 "
                     . "AND jo.member_id = " . $_SESSION['member_id'] . " ORDER BY jo.id DESC LIMIT 4";
 
             $query = $this->db->query($mysql);
-
             $num = $query->num_rows();
 
             if ($num > 0) {
@@ -236,10 +220,12 @@ class Dash extends Users_Controller {
 
                 $this->table->set_heading(array('data' => 'Added/Expire', 'style' => 'width:120px'), 'Title/Recipient', array('data' => 'Status', 'style' => 'width:100px'), array('data' => '', 'style' => 'width:100px'));
                 $data['offer_dash'] = $this->table->generate($query);
+                $data['offer_dash_result'] = $query->result();
                 $offer_found = true;
             }
         }
 
+        $data["offer_found"] = $offer_found;
         return $data;
     }
 

www/application/controllers/Home.php

@@ -6,7 +6,8 @@ class Home extends WRB_Controller {
 
     public function index() {
 
-        $this->home1('');
+        //$this->home1('');
+		$this->load->view('site3/external/view_home');
     }
 
     public function about() {

www/application/controllers/Jobs.php

@@ -500,8 +500,8 @@ class Jobs extends Users_Controller {
                 . ' AND expire> now() AND public_view >  0';
 
         $query = $this->db->query($mysql);
-
         $num = $query->num_rows();
+        $data['market_table_result'] = $query->result(); // used in new impl.
 
         if ($num > 0) {
             $myTable = "<table class='table table-striped table-hover table-bordered table-condensed'>";
@@ -520,9 +520,13 @@ class Jobs extends Users_Controller {
 
         $_SESSION['secure_data'] = $data; // all data needed for secure page
         $data['page_title'] = "Available Jobs & Tasks";
-        $this->load->view('users/view_header_user', $data);
+ /*       $this->load->view('users/view_header_user', $data);
         $this->load->view('jobs/view_market', $data);
         $this->load->view('users/view_footer_user', $data);
+*/
+    //    var_dump( $data['market_table_result']);
+      //  exit;
+       $this->renderSecurePage('jobs/view_market', $data);
     }
 
     private function makeMarketTableRow($row) {
@@ -606,9 +610,9 @@ echo   $this->getMarketInterestMessage( $data['offer_code'], $out['client_id'] )
 
         if ($num > 0) {
             $row = $query->row_array();
-            $myTable = "<table class='table table-sm table-hover table-bordered table-condensed' style=' background-color: #ebf1e8;'>";
+            $myTable = " <div class='card card-xl-stretch mb-5 mb-xl-8'>";
             $myTable .= $this->makeMarketDetailTableRow($row);
-            $myTable .="</table>";
+            $myTable .="</div>";
         }
 
         echo $myTable;
@@ -625,19 +629,19 @@ echo   $this->getMarketInterestMessage( $data['offer_code'], $out['client_id'] )
 
 
 
-        return "<tr><td colspan='2' ><b>" . $row['offer_code'] . "</b> Timeline:" . $row['timeline_days'] . " day(s)  -  <b>Budget: </b> " . $row['price'] * 0.01 . " Naira</td></tr>"
+        return "<div class='card-body'><table class='table table-sm table-hover table-bordered table-condensed' style='background-color: #ffffff;'><tr><td colspan='2' ><b>" . $row['offer_code'] . "</b> Timeline:" . $row['timeline_days'] . " day(s)  -  <b>Budget: </b> " . $row['price'] * 0.01 . " Naira</td></tr>"
-                . "<tr><td style='width:100px;'><b>Title</b></td><td>" . $row['title'] . "</td></tr>"
+        . "<tr><td style='width:100px;'><b>Title</b></td><td>" . $row['title'] . "</td></tr>"
-                . "<tr><td><b>Description</b></td><td>" . $row['description'] . "</td></tr>"
+        . "<tr><td><b>Description</b></td><td>" . $row['description'] . "</td></tr>"
-                . "<tr><td><b>Detail</b></td><td>" . $row['job_description'] . "</td></tr>"
+        . "<tr><td><b>Detail</b></td><td>" . $row['job_description'] . "</td></tr>"
-                . "<tr><td colspan='2' >Interests : <b>" . $data['interest'] . "</b>   Expire:<b> " . $row['expire']."</b> </td></tr>"
+        . "<tr><td colspan='2' >Interests : <b>" . $data['interest'] . "</b>   Expire:<b> " . $row['expire']."</b> </td></tr>"
-                . "<tr><td><b></b></td><td style='text-align:right;'><input type=submit id='submit_interest_" . $row['offer_code'] . "' name=\"mview\" onclick=\"return SInterest('" . $row['offer_code'] . "');\" class=\"btn btn-success btn-xs\" value=\"Send Interest Request
+        . "<tr><td><b></b></td><td style='text-align:right;'><input type=submit id='submit_interest_" . $row['offer_code'] . "' name=\"mview\" onclick=\"return SInterest('" . $row['offer_code'] . "');\" class=\"btn btn-success btn-xs\" value=\"Send Interest Request
-\"></td></tr>"
+        \"></td></tr>"
-                . "<tr><td colspan='2'>If you have any questions about this task :"
+        . "<tr><td colspan='2'>If you have any questions about this task :"
-                . "<div id='msg_result_" . $row['offer_code'] . "'><form name=\"job_message\"><table class='table table-striped table-hover table-bordered table-condensed'>"
+        . "<div id='msg_result_" . $row['offer_code'] . "'><form name=\"job_message\"><table class='table table-striped table-hover table-bordered table-condensed'>"
-                . "<tr><td><textarea name='yourmessage'  cols=\"5\" rows=\"3\" class=\"textarea form-control\"  class=\"btn btn-success btn-xs\"  placeholder=\"Enter message here ...\"></textarea></td></tr>"
+        . "<tr><td><textarea name='yourmessage'  cols=\"5\" rows=\"3\" class=\"textarea form-control\"  class=\"btn btn-success btn-xs\"  placeholder=\"Enter message here ...\"></textarea></td></tr>"
-                . "<tr><td style='text-align:right;'><button id='submit_yourmessage_" . $row['offer_code'] . "' onclick=\"return OMessage('" . $row['offer_code'] . "');\" class=\"btn btn-info btn-xs\">Send Message</button></td></tr></table></form></div>"
+        . "<tr><td style='text-align:right;'><button id='submit_yourmessage_" . $row['offer_code'] . "' onclick=\"return OMessage('" . $row['offer_code'] . "');\" class=\"btn btn-info btn-xs\">Send Message</button></td></tr></table></form></div>"
-                . "</td></tr>"
+        . "</td></tr>"
-                . " ";
+        . " </table></div>";
     }
 
     public function viewmyjob() {
@@ -667,9 +671,11 @@ echo   $this->getMarketInterestMessage( $data['offer_code'], $out['client_id'] )
 
                 $data['job_link'] = 'https://'.$_SERVER['HTTP_HOST']."/plb/viewjob/".$out['offer_code'];
 
-                $this->load->view('users/view_header_user', $data);
+               /* $this->load->view('users/view_header_user', $data);
                 $this->load->view('jobs/view_viewmyjoboffer', $data);
-                $this->load->view('users/view_footer_user', $data);
+                $this->load->view('users/view_footer_user', $data);*/
+
+                $this->RenderUserPage('jobs/view_viewmyjoboffer', $data);
             } else {
                 redirect('dash');  // go back to dash if not valid
             }

www/application/controllers/Login.php

@@ -138,16 +138,17 @@ class Login extends WRB_Controller {
 
         if( strlen( $data["login_message"]) >  0 )
         {
-             $data["login_message"] =  "<div class=\"text-left\"><div class=\"alert alert-danger no-border\">" .  $data["login_message"] . "</div></div>";
+             $data["login_message"] =  "<div class=\"text-left\"><div class=\"alert alert-danger no-border\">" .  $data["login_message"] . "-<a href=\"/password_recovery\">Forgot Password ?</a></div></div>";
         }
         $data['title'] = "Login"; // Capitalize the first letter
         $data['page_title'] = "Login WrenchBoard";
-        //$this->load->view('templates/header_boxed', $data);
+        //----- long out $this->load->view('templates/header_boxed', $data);
-        $this->load->view('users/view_login', $data);
+        //$this->load->view('users/view_login', $data);
-        $this->load->view('users/view_external_footer');
+        //$this->load->view('users/view_external_footer');
+		$this->load->view('site3/external/view_home',$data);
     }
 
-
+//<a href="/password_recovery">Forgot Password ?</a>
 
         public function refreshAccountDetail($member_id) {
         $this->load->model('account_model');

www/application/controllers/Member.php

@@ -438,9 +438,12 @@ class Member extends Users_Controller {
 
         $data['galery_list'] =  $this->getGaleryList($_SESSION['member_id']);
                 
-        $this->load->view('users/view_header_user', $data);
+      /*  $this->load->view('users/view_header_user', $data);
         $this->load->view('users/view_yourpage', $data);
         $this->load->view('users/view_footer_user', $data);
+*/
+        $data['page_title'] ="My Page";
+        $this->renderSecurePage('users/view_yourpage', $data);
     }
 
     
@@ -633,6 +636,22 @@ class Member extends Users_Controller {
        // $data['fee'] = 0;
         //$data['escrow_balance'] = 0;
 
+        $this->load->library('table');
+        $this->table->set_template($this->template);
+        $mysql = "SELECT m.added::date AS date,m.terminatingamount*0.01 AS amount,m.fee*0.01 as fee, "
+            . "r.firstname||' '||r.lastname||'<br><b>Acc:</b>'||r.account_no||'-'||b.name AS Recitient,mp.confirmation,"
+            . "CASE WHEN m.status=1 THEN 'Pending' WHEN m.status=3 THEN 'Cancelled' WHEN m.status=5 THEN 'Completed' ELSE '' END AS Status "
+            . "FROM money_transfer m "
+            . "LEFT JOIN sendmoney_recipient r ON r.id = m.recipientid "
+            . "LEFT JOIN bank_entity_codes b ON b.code = r.bank_code "
+            . "LEFT JOIN members_payments mp ON mp.what_sendmoney = m.id "
+            . "WHERE  m.member_id =" . $_SESSION['member_id'] . " AND mp.confirmation IS NOT NULL ORDER BY m.id DESC LIMIT 4";
+
+        $query = $this->db->query($mysql);
+        $this->table->set_heading('Date', 'Amount','Fee','Recipient','Confirmation', 'Status');
+        $data['sendmoney_table'] = $this->table->generate($query);
+        $data['sendmoney_table_result'] = $query->result();
+
         if ($_POST) {
             $data['comment'] = $this->input->post('comment');
             $data['amount'] = $this->input->post('amount') + 0; // must be number [still in full will be cents to go to backend latter]
@@ -664,24 +683,80 @@ class Member extends Users_Controller {
             }
         }
         
+
+        $data['page_title'] ="Wallet";
+        $this->RenderUserPage('users/view_balance', $data);
+    }
+
+
+    public function smoney() {
+
+        $data = $this->getSessionArray();
+
+
+
+
+        $data['add_error'] = '';
+        $data['amount'] = 0;
+        $this->load->model('combo_model');
+        $data['recipient_account'] = $this->input->post('recipient_account');
+        $data['recipient_account_combo'] = $this->combo_model->getUserRecipientCombo('recipient_account', $_SESSION['member_id'], $data['recipient_account']);
+        $data['fee'] = $data['total'] =0;
+        $data['comment'] = '';
+        // $data['fee'] = 0;
+        //$data['escrow_balance'] = 0;
+
+        if ($_POST) {
+            $data['comment'] = $this->input->post('comment');
+            $data['amount'] = $this->input->post('amount') + 0; // must be number [still in full will be cents to go to backend latter]
+
+            if ($data['amount'] == 0 || $data['amount'] < 0 || $data['amount'] == '' || $data['recipient_account'] == '') {
+                $out['error'] = 'Amount & Recipient Account Required';
+                $data['add_error'] = "<div class=\"text-left\"><div class=\"alert alert-danger no-border\">" . $out['error'] . "</div></div>";
+                if ($data['amount'] > 0) {
+                    $outx = $this->transactionFee($data['amount'], $_SESSION['member_id']);
+                    $data['total'] = $outx['total_amount'];
+                    $data['fee'] = $outx['processing_fee'];
+                }
+            } else {
+
+                $outx = $this->transactionFee($data['amount'], $_SESSION['member_id']);
+                $data['total'] = $outx['total_amount'];
+                $data['fee'] = $outx['processing_fee'];
+
+                $TotalAmount = $data['total'];
+
+                // now let us do initial check if you have enough money
+                if ($_SESSION['current_balance'] < $TotalAmount) {
+                    $out['error'] = 'You do not have enough balance for this transfer';
+                    $data['add_error'] = "<div class=\"text-left\"><div class=\"alert alert-danger no-border\">" . $out['error'] . "</div></div>";
+                } else {
+                    $this->session->set_flashdata('pending_sendmoney', $data);
+                    redirect('member/confirmwithdraw');
+                }
+            }
+        }
+
         $this->load->library('table');
         $this->table->set_template($this->template);
         $mysql = "SELECT m.added::date AS date,m.terminatingamount*0.01 AS amount,m.fee*0.01 as fee, "
-                . "r.firstname||' '||r.lastname||'<br><b>Acc:</b>'||r.account_no||'-'||b.name AS Recitient,mp.confirmation,"
+            . "r.firstname||' '||r.lastname||'<br><b>Acc:</b>'||r.account_no||'-'||b.name AS Recitient,mp.confirmation,"
-                . "CASE WHEN m.status=1 THEN 'Pending' WHEN m.status=3 THEN 'Cancelled' WHEN m.status=5 THEN 'Completed' ELSE '' END AS Status "
+            . "CASE WHEN m.status=1 THEN 'Pending' WHEN m.status=3 THEN 'Cancelled' WHEN m.status=5 THEN 'Completed' ELSE '' END AS Status "
-                . "FROM money_transfer m "
+            . "FROM money_transfer m "
-                . "LEFT JOIN sendmoney_recipient r ON r.id = m.recipientid "
+            . "LEFT JOIN sendmoney_recipient r ON r.id = m.recipientid "
-                . "LEFT JOIN bank_entity_codes b ON b.code = r.bank_code "
+            . "LEFT JOIN bank_entity_codes b ON b.code = r.bank_code "
-                . "LEFT JOIN members_payments mp ON mp.what_sendmoney = m.id "
+            . "LEFT JOIN members_payments mp ON mp.what_sendmoney = m.id "
-                . "WHERE  m.member_id =" . $_SESSION['member_id'] . " AND mp.confirmation IS NOT NULL ORDER BY m.id DESC LIMIT 4";
+            . "WHERE  m.member_id =" . $_SESSION['member_id'] . " AND mp.confirmation IS NOT NULL ORDER BY m.id DESC LIMIT 4";
 
         $query = $this->db->query($mysql);
         $this->table->set_heading('Date', 'Amount','Fee','Recipient','Confirmation', 'Status');
         $data['sendmoney_table'] = $this->table->generate($query);
-
+        $data['sendmoney_table_result'] = $query->result();
-          $this->RenderUserPage('users/view_balance', $data);
+        $data['page_title'] ="Wallet";
+        $this->RenderUserPage('users/view_smoney', $data);
     }
 
+
     public function fee() {
         $amount = $this->input->get('amount') + 0;
         $res = $this->transactionFee($amount, $_SESSION['member_id']);
@@ -705,13 +780,22 @@ class Member extends Users_Controller {
     public function confirmwithdraw() {
         $final_page = false;
         $data = $this->getSessionArray();
-  
+
+
+
+
+
+
+
+
+
+
         //$data = $this->getSessionArray();
         if ($_POST) {
-
+//    case 'sendmoney':$in["action"] = WRENCHBOARD_USER_SENDMONEY;
             //$data = array();
             $data['member_id'] = $_SESSION['member_id'];
-            $data['action'] = WRENCHBOARD_SMONEY_MEMBER;
+            $data['action'] =  WRENCHBOARD_SMONEY_MEMBER;
             $data["senderid"] = $_SESSION['member_id'];
             $data["InitiatingEntityCode"] = "MBA";
 
@@ -734,6 +818,7 @@ class Member extends Users_Controller {
                 $out = array();
                 $res = $this->backend_model->wrenchboard_api($data, $out);
                // print_r($out);
+               //exit;
                 $data = $this->getSessionArray(); // you will need this for new balace
                 $data["fee"] = $out["Fee"];
                 $data["amount"] = $out["InitiatingAmount"];
@@ -784,16 +869,34 @@ class Member extends Users_Controller {
             $data['recipient_account_combo'] = $this->combo_model->getUserRecipientCombo('recipient_account', $_SESSION['member_id'], $data['recipient_account']);
 
            // $this->load->view('users/view_header_user', $data);
+             $data['sendmoney_table_result'] = $this->getSendMoneyRecent();
               $this->RenderUserPage('users/view_confirmwithdraw', $data);
            // $this->load->view('users/view_footer_user', $data);
         } else {
             
             //$this->load->view('users/view_header_user', $data);
+            $data['sendmoney_table_result'] = $this->getSendMoneyRecent();
               $this->RenderUserPage('users/view_finalwithdraw', $data);
            // $this->load->view('users/view_footer_user', $data);
         }
     }
 
+
+    private function getSendMoneyRecent(){
+
+        $mysql = "SELECT m.added::date AS date,m.terminatingamount*0.01 AS amount,m.fee*0.01 as fee, "
+            . "r.firstname||' '||r.lastname||'<br><b>Acc:</b>'||r.account_no||'-'||b.name AS Recitient,mp.confirmation,"
+            . "CASE WHEN m.status=1 THEN 'Pending' WHEN m.status=3 THEN 'Cancelled' WHEN m.status=5 THEN 'Completed' ELSE '' END AS Status "
+            . "FROM money_transfer m "
+            . "LEFT JOIN sendmoney_recipient r ON r.id = m.recipientid "
+            . "LEFT JOIN bank_entity_codes b ON b.code = r.bank_code "
+            . "LEFT JOIN members_payments mp ON mp.what_sendmoney = m.id "
+            . "WHERE  m.member_id =" . $_SESSION['member_id'] . " AND mp.confirmation IS NOT NULL ORDER BY m.id DESC LIMIT 4";
+
+         $query = $this->db->query($mysql);
+        return $query->result();
+
+    }
     public function completewithdraw() {
 
         echo 'Not attached - backend implemented already';
@@ -817,7 +920,7 @@ class Member extends Users_Controller {
 
         $myTable .="</table>";
 
-
+        $data['page_title'] ="Messages";
         //$this->table->set_heading(array('data' => 'Date', 'style' => 'width:110px'), 'Message');
         $data['message_table'] = $myTable; //$this->table->generate($query);
         $this->RenderUserPage('users/view_message', $data);
@@ -946,9 +1049,11 @@ class Member extends Users_Controller {
 
         $this->table->set_heading(array('data' => 'Date', 'style' => 'width:110px'), 'Description', array('data' => 'Amount', 'style' => 'width:100px'), array('data' => 'Fee', 'style' => 'width:70px'), array('data' => 'Confirmation', 'style' => 'width:100px'));
         $data['payment_result'] = $this->table->generate($query);
+        $data['payment_data_result'] = $query->result();
         $data["links"] = $this->pagination->create_links();
 
         // $this->load->view('users/view_header_user', $data);
+        $data['page_title'] ="Payments Report";
         $this->RenderUserPage('users/view_payment', $data);
         //  $this->load->view('users/view_footer_user', $data);
     }

www/application/controllers/Outmessage.php

@@ -7,9 +7,10 @@ class Outmessage extends CI_Controller {
         $data['account_email'] = ''; //$data['username'];
         $data['title'] = "Message"; //ucfirst($page); // Capitalize the first letter
         $data['page_title'] = "Verify Email.";
-        $this->load->view('templates/header_boxed', $data);
+        //$this->load->view('templates/header_boxed', $data);
-        $this->load->view('users/view_outmessage', $data);
+        //$this->load->view('users/view_outmessage', $data);
-        $this->load->view('templates/footer_boxed', $data);
+        //$this->load->view('templates/footer_boxed', $data);
+		$this->load->view('site3/external/view_signup_started',$data);
     }
 
 }

www/application/controllers/Password_recovery.php

@@ -5,29 +5,25 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 class Password_recovery extends CI_Controller {
 
     public function index() {
-        //echo "ameye   kvkgkg";
         $data['action_message'] = "";
-
-
         if ($_POST) {
-
             $data['email'] = $this->input->post('email');
             if ($data['email'] == '') {
                 $out['error'] = 'Please specify valid emal to continue';
                 $data['action_message'] = "<div class=\"text-left\"><div class=\"alert alert-danger no-border\">" . $out['error'] . "</div></div>";
             } else {
-                //WRENCHBOARD_ACCOUNT_RESETPASS
-
                 $this->resetMemberPass($data['email']);
-
+                $out['error'] = "&nbsp;&nbsp;If we find your email,  you will receive a link to reset your password. Please use or <a 
-                $out['error'] = "If we find your email,  you will receive a link to reset your password. Please use or <a href='/contact'>contact form</a> if you did not get our message after few minutes. ";
+href='https://www.wrenchboard.com/contact'>contact form</a> if you did not get our message after few minutes. ";
                 $data['action_message'] = "<div class=\"text-left\"><div class=\"alert alert-info no-border\">" . $out['error'] . "</div></div>";
             }
         }
         $data["message"] = "Enter your account username, Email.<br> We will send you an email to reset your password";
-        $this->load->view('users/view_external_header');
+       // $this->load->view('users/view_external_header');
-        $this->load->view('users/view_password_recovery', $data);
+       // $this->load->view('users/view_password_recovery', $data);
-        $this->load->view('users/view_external_footer');
+       // $this->load->view('users/view_external_footer');
+		$this->load->view('site3/external/view_resetpass',$data);
+		//
     }
 
     var $actionMessage = '';

www/application/controllers/Plb.php

@@ -14,17 +14,7 @@ class Plb extends WRB_Controller {
     }
 
     private function jobViewPage($offerCode) {
-        /*  $data['sitename'] = 'home';
-          $this->load->view('templates/header_boxed', $data);
-          $this->load->view('users/view_index');
-          $this->load->view('users/view_external_footer');
-         * */
-        //   $this->load->view('users/view_index');
-        //    $this->load->view('users/view_external_footer');
-
         $data = array();
-
-
         $mysql = "SELECT jo.expire,jo.id AS offer_id, jo.offer_code,mj.title,mj.description,mj.timeline_days,mj.price,jo.job_description FROM members_jobs_offer jo "
                 . " LEFT JOIN members_jobs mj ON mj.id=jo.job_id "
                 . " WHERE mj.status=1 AND jo.status=1 "
@@ -55,25 +45,9 @@ class Plb extends WRB_Controller {
                 . " WHERE o.public_view =1 AND  o.offer_code<>'" . $offerCode . "' AND o.expire> now() AND o.status=1 ORDER BY o.id DESC LIMIT 50";
         $query = $this->db->query($mysql2);
         $data["numof_other_jobs"] = $query->num_rows();
-        $data["job_data"] = $query->result();
+        $data["job_data"] = $query->result()[0];
 
-
+        $this->load->view('site3/external/view_market',$data);
-
-        /*
-          $mysql2 = " SELECT  o.*,j.title,j.description,j.timeline_days,j.price,j FROM members_jobs_offer o "
-          . " LEFT JOIN members_jobs j ON j.id =o.job_id "
-          . " WHERE o.public_view =1 AND  o.offer_code<>'" . $offerCode . "' AND o.expire> now() ORDER BY o.id DESC LIMIT 50";
-
-
-          $query = $this->db->query($mysql2);
-          $data["numof_other_jobs"] = $query->num_rows();
-          $data["job_data"] = $query->result();
-         */
-
-
-        $this->load->view('templates/view_header_market', $data);
-        $this->load->view('site/view_market', $data);
-        $this->load->view('templates/view_footer_market', $data);
     }
 
     private function makeMarketTableRow($row) {
@@ -92,13 +66,13 @@ class Plb extends WRB_Controller {
 
 
 
-        return "<table class='table table-striped table-hover table-bordered table-condensed'><tr><td colspan='2' ><b> Timeline:</b>" . $row['timeline_days'] . " day(s)  -  <b>Budget: </b> " . $row['price'] * 0.01 . " Naira</td></tr>"
+        return "<table class='table table align-middle gs-0 gy-5'><tr><td colspan='2' ><b> Timeline:</b>" . $row['timeline_days'] . " day(s)  -  <b>Budget: </b> " . $row['price'] * 0.01 . " Naira</td></tr>"
                 . "<tr><td style='width:100px;'><b>Title</b></td><td>" . $row['title'] . "</td></tr>"
                 . "<tr><td><b>Description</b></td><td>" . $row['description'] . "</td></tr>"
                 . "<tr><td><b>Detail</b></td><td>" . $row['job_description'] . "</td></tr>"
                 . "<tr><td colspan='2' >Interests : <b>" . $data['interest'] . "</b>   Expire:<b> " . $row['expire'] . "</b> </td></tr>"
-                . "<tr><td><b></b></td><td style='text-align:right;'><input type=submit id='submit_interest_" . $row['offer_code'] . "' name=\"mview\" onclick=\"return LoginInterest('" . $row['offer_code'] . "');\" class=\"btn btn-success btn-xs\" value=\"see more ?
+
-\"></td></tr>"
+                . "<tr><td><b></b></td><td style='text-align:right;'><a class=\"btn btn-primary btn-xs\"  href='/login'>See More</a></td></tr>tr>"
                 . "</table> ";
     }
 

www/application/controllers/Proj.php

@@ -232,9 +232,13 @@ class Proj extends Users_Controller {
             $data['current_balance'] = $out['current_balance'];
             $data['new_message'] = $out['new_message'];
 
-            $this->load->view('users/view_header_user', $data);
+           /* $this->load->view('users/view_header_user', $data);
             $this->load->view('jobs/view_activejob', $data);
-            $this->load->view('users/view_footer_user', $data);
+            $this->load->view('users/view_footer_user', $data);*/
+
+            $data['page_title'] = "Active Task";
+            $this->RenderUserPage('jobs/view_activejob', $data);
+
         }
     }
 

www/application/controllers/Refer.php

@@ -95,13 +95,15 @@ class Refer extends Users_Controller {
         $this->table->set_heading(array('data' => 'Added/Name', 'style' => 'width:170px'), 'Email', array('data' => 'Status', 'style' => 'width:80px'));
 
         $data['refer_table'] = $this->table->generate($query);
-
+        $data['refer_table_result'] =$query->result();
         
         $data['page_title'] ="Refer a Friend";
-        
+       /*
         $this->load->view('users/view_header_user', $data);
         $this->load->view('users/view_refer', $data);
         $this->load->view('users/view_footer_user', $data);
+*/
+        $this->RenderUserPage('users/view_refer', $data);
     }
 
     public function refagree() {

www/application/controllers/Signup.php

@@ -18,6 +18,7 @@ class Signup extends CI_Controller {
         $submit = NULL;
 
         extract($_POST);
+        //var_dump($_POST);
 
         $data['firstname'] = $firstname;
         $data['lastname'] = $lastname;
@@ -39,7 +40,8 @@ class Signup extends CI_Controller {
         $data['signup_error'] = '';
 
         if ($_POST) { // post
-            if ($data['terms'] == 'on') {
+            if ($data['terms'] == 'on' || $data['terms'] == '1') {
+				$data['terms'] == 'on';
                 $terms_checked = 'checked';
             }
 
@@ -73,6 +75,7 @@ class Signup extends CI_Controller {
             } else {
                 $data['signup_error'] = "Enter all required fields";
             }
+			//exit;
         } // if post 
         $data['signup_error_style'] = '';
         if (strlen($data['signup_error']) > 0) {
@@ -83,8 +86,9 @@ class Signup extends CI_Controller {
         $data['terms'] = $terms_checked;
 
 
-        $this->load->view('users/view_registration', $data);
+        //$this->load->view('users/view_registration', $data);
-        $this->load->view('users/view_external_footer', $data);
+        //$this->load->view('users/view_external_footer', $data);
+		$this->load->view('site3/external/view_signup',$data);
     }
 
 }

www/application/controllers/Site.php

@@ -11,7 +11,9 @@ class Site extends WRB_Controller {
         $this->load->view('users/view_external_footer');
        * */
        
-        $this->home1();
+       // $this->home1();
+		$this->load->view('site3/external/view_home');
+		///home/oameye/wrenchboard/www/application/views/site3/external
     }
 
     public function registration() {

www/application/libraries/Users_Controller.php

@@ -77,11 +77,20 @@ class Users_Controller extends WRB_Controller {
             redirect(home);
         }
     }
-    
+
+    protected function renderSecurePage($page_path_name, $data) {
+        $this->load->view('site3/internal/template/view_securehead', $data);
+        $this->load->view( $page_path_name, $data);
+        $this->load->view('site3/internal/template/view_securefooter', $data);
+    }
+
     protected function RenderUserPage($page_name, $data) {
+        return $this->renderSecurePage($page_name, $data);
+        /*
         $this->load->view('users/view_header_user', $data);
         $this->load->view($page_name, $data);
         $this->load->view('users/view_footer_user', $data);
+        */
     }
 
 }

www/application/views/home2/header.php

@@ -3,7 +3,7 @@
     <head>
 
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <meta name="author" content="SemiColonWeb" />
+        <meta name="author" content="WrenchBoard" />
 
         <meta name="description" content="wrenchboard.com is an online marketplace to make money from your skills, find, buy and sell professional services. Connect with freelancers to get work done faster. Trade your freelance services." />
         <meta name="title" content="WrenchBoard: Find a Freelancer  | Sell Professional Services" />

www/application/views/jobs/view_activejob.php

@@ -12,28 +12,53 @@
             return false;
         }
     // -->
-    </script>  
+    </script>
-<div class="content-wrapper">
-    <!-- Quick stats boxes -->
-    <?php include('common/jobstrip.php');?>
-    <!-- /quick stats boxes -->
-    
-    <!-- Marketing campaigns -->
-    <div class="panel panel-flat">
-          <div class="panel-heading" style="height: 550px;">              
-            <div class="table-responsive">  
-                   <h5 class="panel-title">Active Task</h5>
-                <?php echo $job_table ?>
-            </div>
-             <div class="panel-heading">
-            <?php echo $links; ?>
-        </div>
-        </div>
-    </div>
-    <!-- /marketing campaigns -->
 
+<!-- Quick stats boxes -->
+<?php include('common/jobstrip.php');?>
+<!-- /quick stats boxes -->
+
+<!--begin::Row-->
+<div class="row g-5 g-xl-8">
+    <div class="col-xl-12">
+        <!--begin::Charts Widget 1-->
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <!--begin::Title-->
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Active Task</span>
+                </h3>
+                <!--end::Title-->
+
+            </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <?php echo $job_table ?>
+                        </div>
+                        <!--end::Table-->
+                        <?php echo $links; ?>
+                    </div>
+                    <!--end::Tap pane-->
+
+                </div>
+
+
+            </div>
+            <!--end::Body-->
+        </div>
+        <!--end::Charts Widget 1-->
+    </div>
 </div>
-<!-- /main content -->
+<!--end::Row-->
+
 
 
 
@@ -85,11 +110,12 @@ function showJobModal(contact_id) {
     var post_data = {
         'interest_id': id,
     };
+//alert(contact_id);
 
     $.ajax({
         url: "/jobs/jobdetail_modal?contact_id="+contact_id
     }).done(function (data) {
-//alert(data);
+       // alert(data);
         $('#modal-content').html(data);
     });
 }
@@ -100,12 +126,10 @@ function showJobModal(contact_id) {
 
 <!-- Basic modal -->
 <div id="modal_theme_primary" class="modal fade">
-    <div class="modal-dialog">
+    <div class="modal-dialog  mw-650px">
         <div class="modal-content" id="modal-content">
 
         </div>
     </div>
 </div>
-<!-- /basic modal -->
+<!-- /basic modal -->
-
-   

www/application/views/jobs/view_market.php

@@ -11,37 +11,176 @@
         return false;
     }
     // -->
-</script> 
+</script>
 
-<!-- Main content -->
+<!--begin::Toolbar-->
-<div class="content-wrapper">
+<div class="d-flex flex-wrap flex-stack my-5">
-  <?php include('common/jobstrip.php');?>
+    <!--begin::Heading-->
-    <!-- Main charts -->
+    <h2 class="fs-2 fw-bold my-2">Available Jobs
-    <!--div class="row">
-        <div class="col-lg-12">
-            <div class="panel panel-flat"  style="height: 45px; background-color: #f1fdd5;">
-                Menu Here
-            </div>
-        </div>
-    </div -->
-    <!-- /main charts -->
-    <div class="row">
-        <div class="col-md-12">            
-            <div class="panel panel-flat" >                     
-                <?php echo $market_table; ?>
-            </div>
-        </div>
 
+    <!--end::Heading-->
+    <!--begin::Controls-->
+    <div class="d-flex flex-wrap my-1">
+        <!--begin::Select wrapper-->
+        <!-- div class="m-0">
+            <select name="status" data-control="select2" data-hide-search="true" class="form-select form-select-sm bg-body border-body fw-bolder w-125px">
+                <option value="Active" selected="selected">Active</option>
+                <option value="Approved">In Progress</option>
+                <option value="Declined">To Do</option>
+                <option value="In Progress">Completed</option>
+            </select>
+        </div -->
+        <!--end::Select wrapper-->
     </div>
+    <!--end::Controls-->
+</div>
+<!--end::Toolbar-->
+<!--begin::Row-->
+<div class="row g-6 g-xl-9">
+    <?php
+    // $market_table_result
+    //onclick="showJobModal('2R05W439BR');"
+    //onclick="return EDetail('$row->offer_code')
+    foreach ($market_table_result as $row)
+    {
+    ?>
+        <!--begin::Col-->
+        <div class="col-md-6 col-xl-4">
+            <!--begin::Card-->
+            <a href="#" onclick="return showMarketJobModal('<?=$row->offer_code?>');" class="card border-hover-primary">
+                <!--begin::Card header-->
+
+                <!--end:: Card header-->
+                <!--begin:: Card body-->
+                <div class="card-body p-9">
+                    <!--begin::Name-->
+                    <div class="fs-3 fw-bolder text-dark"><?=$row->title?></div>
+                    <!--end::Name-->
+                    <!--begin::Description-->
+                    <p class="text-gray-400 fw-bold fs-5 mt-1 mb-7"><?=$row->description?></p>
+                    <!--end::Description-->
+                    <!--begin::Info-->
+                    <div class="d-flex flex-wrap mb-5">
+                        <!--begin::Due-->
+                        <div class="border border-gray-300 border-dashed rounded min-w-125px py-3 px-4 me-7 mb-3">
+                            <div class="fs-6 text-gray-800 fw-bolder"><?=$row->timeline_days?> day(s)</div>
+                            <div class="fw-bold text-gray-400">Timeline</div>
+                        </div>
+                        <!--end::Due-->
+                        <!--begin::Budget-->
+                        <div class="border border-gray-300 border-dashed rounded min-w-125px py-3 px-4 mb-3">
+                            <div class="fs-6 text-gray-800 fw-bolder">N <? echo money_format('%.2n', $row->price * 0.01); ?></div>
+                            <div class="fw-bold text-gray-400">Budget</div>
+                        </div>
+                        <!--end::Budget-->
+                    </div>
+                    <!--end::Info-->
+                    <!--begin::Progress-->
+                    <div class="h-4px w-100 bg-light mb-5" data-bs-toggle="tooltip" title="This project 50% completed">
+                        <div class="bg-primary rounded h-4px" role="progressbar" style="width: 50%" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
+                    </div>
+                    <!--end::Progress-->
+                    <!--begin::Users-->
+                    <div class="symbol-group symbol-hover">
+                        <!--begin::User-->
+
+                            <?=$row->offer_code?>
+
+                        <!--begin::User-->
+                    </div>
+                    <!--end::Users-->
+                </div>
+                <!--end:: Card body-->
+            </a>
+            <!--end::Card-->
+        </div>
+        <!--end::Col-->
+    <?php
+    }
+    ?>
 
 
 </div>
+<!--end::Row-->
+<!--begin::Pagination-->
+<!-- div class="d-flex flex-stack flex-wrap pt-10">
+    <div class="fs-6 fw-bold text-gray-700">Showing 1 to 10 of 50 entries</div>
+    <ul class="pagination">
+        <li class="page-item previous">
+            <a href="#" class="page-link">
+                <i class="previous"></i>
+            </a>
+        </li>
+        <li class="page-item active">
+            <a href="#" class="page-link">1</a>
+        </li>
+        <li class="page-item">
+            <a href="#" class="page-link">2</a>
+        </li>
+        <li class="page-item">
+            <a href="#" class="page-link">3</a>
+        </li>
+        <li class="page-item">
+            <a href="#" class="page-link">4</a>
+        </li>
+        <li class="page-item">
+            <a href="#" class="page-link">5</a>
+        </li>
+        <li class="page-item">
+            <a href="#" class="page-link">6</a>
+        </li>
+        <li class="page-item next">
+            <a href="#" class="page-link">
+                <i class="next"></i>
+            </a>
+        </li>
+    </ul>
+</div -->
+<!--end::Pagination-->
+
+
+
+
+
+<!-- Basic modal -->
+<div id="modal_theme_primary" class="modal fade">
+    <div class="modal-dialog  mw-650px">
+        <div class="modal-content" id="modal-content">
+
+        </div>
+    </div>
+</div>
+<!-- /basic modal -->
 <!-- /main content -->
 <script type="text/javascript">
 <!--
 
 var current_job_contract = null;
 
+function showMarketJobModal(job_contract) {
+    //alert(job_contract);
+    if (typeof event !== 'undefined') {
+        event.preventDefault();
+    }
+
+    // load the modal content with a loader gif and message
+    $('#modal-content').html('Loading...');
+
+    // show modal window
+    $('#modal_theme_primary').modal('show');
+
+
+    //alert("/jobs/marketdetail?proc=NCOMPLETE&job_contract=" + job_contract);
+
+
+    $.ajax({
+        url: "/jobs/marketdetail?proc=NCOMPLETE&job_contract=" + job_contract
+    }).done(function (data) {
+//alert(data);
+        $('#modal-content').html(data);
+    });
+}
+
 function EDetail(job_contract) {
 	if (current_job_contract!=null) {
 		$('#'+current_job_contract).html('');
@@ -92,6 +231,10 @@ function OMessage(offer_code) {
     return false;
 }
 
+
+
+
+
 // -->
 </script>
 

www/application/views/jobs/view_viewmyjoboffer.php

@@ -1,9 +1,94 @@
 <form method="post" name="post_nav_find" action="">
     <input type="hidden" name="jobOfferID" value="<?php echo $jobOfferID; ?>">
 </form>
+<?php include('common/jobstrip.php'); ?>
+
+<!--begin::Row-->
+<div class="row g-5 g-xl-8">
+    <div class="col-xl-12">
+        <!--begin::Charts Widget 1-->
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <!--begin::Title-->
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Recent Task Message</span>
+                </h3>
+                <!--end::Title-->
+
+            </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class='table table-striped table-hover table-bordered table-condensed'>
+                                <thead>
+                                <tr>
+                                    <th colspan="2"><b><?php echo $title; ?></b></th></tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <td colspan="2">
+                                        <div class="alert alert-info no-border">   You have sent this job to <?php echo $job_sent_to; ?></div>
+                                    </td>
+                                </tr>
+
+                                <tr>
+                                    <td style="width: 100px;"><b>Date</b></td><td><?php echo $added_date; ?></td>
+                                </tr>
+                                <tr>
+                                    <td style="width: 100px;"><b>Description</b></td><td><?php echo $description; ?></td>
+                                </tr>
+                                <tr>
+                                    <td style="width: 100px;"><b>Offer Expire</b></td><td><?php echo $expire; ?></td>
+                                </tr>
+                                <tr>
+                                    <td style="width: 100px;"><b>Price</b></td><td><?php echo $price; ?> Naira</td>
+                                </tr>
+                                <tr>
+                                    <td style="width: 100px;"><b>Duration</b></td><td><?php echo $timeline_days; ?> day(s)</td>
+                                </tr>
+                                <tr>
+                                    <td style="width: 100px;"><b>Detail</b></td><td><?php echo $job_description; ?></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2" style='text-align: center;'><input id="sendjob_tome" type="button" class="btn btn-info btn-xs" name='send' value='Send to me' onclick="return sendOfferToMe();"></td>
+                                </tr>
+                                <tr>
+                                    <td style="width: 100px;"><b>Public Link</b></td><td><div class="alert alert-info no-border"> <?php echo $job_link; ?></div></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2"  style='text-align: right;'> <input id="reject_submit" type="button" class="btn btn-danger btn-xs" name='send' value='Cancel Offer' onclick="return cancelOffer();"></td>
+                                </tr>
+                                </tbody>
+                            </table>
+
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+
+                </div>
+
+
+            </div>
+            <!--end::Body-->
+        </div>
+        <!--end::Charts Widget 1-->
+    </div>
+</div>
+<!--end::Row-->
+
+
+
 <!-- Main content -->
 <div class="content-wrapper">
-    <?php include('common/jobstrip.php'); ?>
+
 
     <!-- Main charts -->
     <div class="row">
@@ -15,47 +100,7 @@
     <div class="row">
         <div class="col-md-12">            
             <div class="panel panel-flat">
-                <table class='table table-striped table-hover table-bordered table-condensed'>
+
-                    <thead>
-                        <tr>
-                            <th colspan="2"><b><?php echo $title; ?></b></th></tr>
-                    </thead>
-                    <tbody>
-                         <tr>
-                             <td colspan="2">
-                         <div class="alert alert-info no-border">   You have sent this job to <?php echo $job_sent_to; ?></div>                         
-                         </td>
-                        </tr> 
-                        
-                        <tr>
-                            <td style="width: 100px;"><b>Date</b></td><td><?php echo $added_date; ?></td>
-                        </tr>
-                        <tr>
-                            <td style="width: 100px;"><b>Description</b></td><td><?php echo $description; ?></td>
-                        </tr>
-                        <tr>
-                            <td style="width: 100px;"><b>Offer Expire</b></td><td><?php echo $expire; ?></td>   
-                        </tr>
-                        <tr>
-                            <td style="width: 100px;"><b>Price</b></td><td><?php echo $price; ?> Naira</td>
-                        </tr>
-                         <tr>
-                            <td style="width: 100px;"><b>Duration</b></td><td><?php echo $timeline_days; ?> day(s)</td>
-                        </tr>  
-                        <tr>
-                            <td style="width: 100px;"><b>Detail</b></td><td><?php echo $job_description; ?></td>
-                        </tr> 
-                         <tr>
-                            <td colspan="2" style='text-align: center;'><input id="sendjob_tome" type="button" class="btn btn-info btn-xs" name='send' value='Send to me' onclick="return sendOfferToMe();"></td>
-                        </tr> 
-                         <tr>
-                             <td style="width: 100px;"><b>Public Link</b></td><td><div class="alert alert-info no-border"> <?php echo $job_link; ?></div></td>
-                        </tr>  
-                         <tr>
-                            <td colspan="2"  style='text-align: right;'> <input id="reject_submit" type="button" class="btn btn-danger btn-xs" name='send' value='Cancel Offer' onclick="return cancelOffer();"></td>
-                        </tr> 
-                    </tbody>
-                </table>        
 
             </div>
         </div>

www/application/views/site3/external/footer_links.php

@@ -0,0 +1,13 @@
+<div class="d-flex flex-center flex-column-auto p-10">
+	<div class="d-flex align-items-center fw-bold fs-6">
+		<a href="https://www.wrenchboard.com/about-us" class="text-muted text-hover-primary px-2">About</a>
+		<a href="https://www.wrenchboard.com/service" class="text-muted text-hover-primary px-2">Services</a>
+		<a href="https://www.wrenchboard.com/contact" class="text-muted text-hover-primary px-2">Contact Us</a>
+	</div>
+</div>
+<div class="d-flex flex-center flex-column-auto p-10">
+
+	<div class="d-flex align-items-center fw-bold fs-6">
+		 &copy; <?=date('Y')?> &nbsp;-&nbsp; <a href="/" class="navbar-link">WrenchBoard</a> 
+	</div>
+</div>

www/application/views/site3/external/header_contents.php

@@ -0,0 +1,13 @@
+		<meta charset="utf-8" />
+		 <meta name="description" content="wrenchboard.com is an online marketplace to make money from your skills, find, buy and sell professional services. Connect with freelancers to get work done faster. Trade your freelance services." />
+        <meta name="keywords" content="Online Jobs, Online Workers, work online Nigeria, hire a freelancer, hire freelancers, freelance marketplace, freelancer hire, freelance service, freelance professional services, How to make money online, find workers online, Online Services, digital services, freelancers community in Ghana, freelancers community in Nigeria, freelancer site in Africa, Best freelance website in Africa,  Freelance Designers, Photographers,  Writers in Nigeria, freelancers, freelance outsourcing in Nigeria, freelance IT services in Nigeria, hire freelancers online in Nigeria, freelance services online in Nigeria, freelance contractor in Nigeria, freelance sites in Nigeria, freelance jobs in Nigeria, freelance projects in Nigeria, freelance jobs online in Nigeria, professional freelancers in Nigeria, buy professional services in Nigeria, professional services jobs, professional business services, professional service providers in Nigeria, freelancing services, freelancing sites in Nigeria, freelancers for hire in Nigeria, freelancer search in Nigeria, search freelancer in Nigeria, find freelancers in Nigeria, Find workers US. Outsource from US to Nigeria, find a freelancer in Nigeria, freelancing projects in Nigeria, web freelancing in Nigeria, outsourcing sites freelancers in Nigeria, website for freelancers in Nigeria, marketplace for freelancers " />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<meta property="og:locale" content="en_US" />
+		<meta property="og:type" content="article" />
+		<meta property="og:title" content="WrenchBoard: Find a Freelancer  | Sell Professional Services" />
+		<meta property="og:url" content="https://www.wrenchboard.com" />
+		<meta property="og:site_name" content="wrenchBoard" />
+		<link rel="shortcut icon" href="/assets/ext/images/favicon.png">
+		<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700" />
+		<link href="/site3/assets/plugins/global/plugins.bundle.css" rel="stylesheet" type="text/css" />
+		<link href="/site3/assets/css/style.bundle.css" rel="stylesheet" type="text/css" />

www/application/views/site3/external/view_home.php

@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta name="title" content="WrenchBoard: Find a Freelancer  | Sell Professional Services" />
+        <?php include("header_contents.php");?>
+	</head>
+	<body id="kt_body" class="bg-body">
+	 <script>
+            (function (i, s, o, g, r, a, m) {
+                i['GoogleAnalyticsObject'] = r;
+                i[r] = i[r] || function () {
+                    (i[r].q = i[r].q || []).push(arguments)
+                }, i[r].l = 1 * new Date();
+                a = s.createElement(o),
+                        m = s.getElementsByTagName(o)[0];
+                a.async = 1;
+                a.src = g;
+                m.parentNode.insertBefore(a, m)
+            })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
+
+            ga('create', 'UA-54829827-4', 'auto');
+            ga('send', 'pageview');
+
+        </script>
+		<div class="d-flex flex-column flex-root">
+			<div class="d-flex flex-column flex-column-fluid bgi-position-y-bottom position-x-center bgi-no-repeat bgi-size-contain bgi-attachment-fixed" style="background-image: url(site3/assets/media/background/home.png">
+				<div class="d-flex flex-center flex-column flex-column-fluid p-10 pb-lg-20">
+					<a href="#" class="mb-12">
+						<img alt="WrenchBoard" src="/assets/ext/images/wrenchboard.png" class="h-40px" />
+					</a>
+					<div class="w-lg-500px bg-body rounded shadow-sm p-10 p-lg-15 mx-auto">
+						<form class="form w-100"  action="/login" method="POST">
+							<div class="text-center mb-10">
+								<h1 class="text-dark mb-3">Sign In to WrenchBoard</h1>
+								<div class="text-gray-400 fw-bold fs-4">New Here?
+								<a href="/signup" class="link-primary fw-bolder">Create an Account</a></div>
+							</div>
+							<div class="fv-row mb-10">
+								<label class="form-label fs-6 fw-bolder text-dark">Email</label>
+								<input class="form-control form-control-lg form-control-solid" type="text" placeholder="Username" name="username" required="required" autocomplete="off" />
+							</div>
+							<div class="fv-row mb-10">
+								<div class="d-flex flex-stack mb-2">
+									<label class="form-label fw-bolder text-dark fs-6 mb-0">Password</label>
+									<a href="/password_recovery" class="link-primary fs-6 fw-bolder">Forgot Password ?</a>
+								</div>
+								<input class="form-control form-control-lg form-control-solid" type="password"  placeholder="Password" name="password" required="required" autocomplete="off" />
+							</div>
+							<?php
+							if ( isset($login_message) && $login_message !=''){
+								?>
+									<div class="fv-row mb-10">
+										
+											<?php echo isset($login_message)?$login_message:''; ?> 
+										<div class="d-flex flex-stack mb-2"></div>
+									</div>
+								<?php
+							}
+							?>
+
+							<div class="text-center">
+								<button type="submit" id="kt_sign_in_submit" class="btn btn-lg btn-primary w-100 mb-5">
+									<span class="indicator-label">Continue</span>
+									<span class="indicator-progress">Please wait...
+									<span class="spinner-border spinner-border-sm align-middle ms-2"></span></span>
+								</button>
+								<div class="text-center text-muted text-uppercase fw-bolder mb-5">or</div>
+								<!--a href="#" class="btn btn-flex flex-center btn-light btn-lg w-100 mb-5">
+								<img alt="Logo" src="/site3/assets/media/svg/brand-logos/google-icon.svg" class="h-20px me-3" />Continue with Google</a -->
+								<!--end::Google link-->
+								<!--begin::Google link-->
+								<a href="<?php echo $this->lib_login->getLoginUrl(); ?>" class="btn btn-flex flex-center btn-light btn-lg w-100 mb-5">
+								<img alt="Logo" src="/site3/assets/media/svg/brand-logos/facebook-4.svg" class="h-20px me-3" />Continue with Facebook</a>
+								<!--end::Google link-->
+								<!--begin::Google link-->
+								<!-- a href="#" class="btn btn-flex flex-center btn-light btn-lg w-100">
+								<img alt="Logo" src="/site3/assets/media/svg/brand-logos/apple-black.svg" class="h-20px me-3" />Continue with Apple</a -->
+								<!--end::Google link-->
+							</div>
+							<!--end::Actions-->
+						</form>
+						<!--end::Form-->
+					</div>
+					<!--end::Wrapper-->
+				</div>
+				<!--end::Content-->
+				<!--begin::Footer-->
+				<?php include("footer_links.php");?>
+			</div>
+		</div>
+		<script src="/site3/assets/plugins/global/plugins.bundle.js"></script>
+		<script src="/site3/assets/js/scripts.bundle.js"></script>
+		<script src="/site3/assets/js/custom/home/general.js"></script>
+	</body>
+	<!--end::Body-->
+</html>

www/application/views/site3/external/view_market.php

@@ -0,0 +1,138 @@
+<form method="post" name="post_nav_find" action="">
+    <input type="hidden" name="jobOfferID" value="">
+    <input type="hidden" name="jobID" value="">
+</form>
+<script type="text/javascript">
+    <!--
+       function post_nav_find_action(what, value) {
+        // alert(what);
+        document.post_nav_find.action = what + '';
+        document.post_nav_find.jobOfferID.value = value;
+        document.post_nav_find.jobID.value = value;
+        document.post_nav_find.submit();
+        return false;
+    }
+    // -->
+</script>
+
+
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta name="title" content="WrenchBoard: Find a Freelancer  | Sell Professional Services" />
+    <?php include("header_contents.php");?>
+</head>
+<body id="kt_body" class="bg-body">
+<script>
+    (function (i, s, o, g, r, a, m) {
+        i['GoogleAnalyticsObject'] = r;
+        i[r] = i[r] || function () {
+            (i[r].q = i[r].q || []).push(arguments)
+        }, i[r].l = 1 * new Date();
+        a = s.createElement(o),
+            m = s.getElementsByTagName(o)[0];
+        a.async = 1;
+        a.src = g;
+        m.parentNode.insertBefore(a, m)
+    })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
+
+    ga('create', 'UA-54829827-4', 'auto');
+    ga('send', 'pageview');
+
+</script>
+
+<?php
+//var_dump($job_data);
+?>
+
+<div class="d-flex flex-column flex-root">
+    <div class="d-flex flex-column flex-column-fluid bgi-position-y-bottom position-x-center bgi-no-repeat bgi-size-contain bgi-attachment-fixed" style="background-image: url(site3/assets/media/background/home.png); ">
+        <div class="d-flex flex-center flex-column flex-column-fluid p-10 pb-lg-20">
+            <a href="#" class="mb-12">
+                <img alt="WrenchBoard" src="/assets/ext/images/wrenchboard.png" class="h-40px" />
+            </a>
+
+        </div>
+        <!--end::Content-->
+
+
+        <!--begin::Content-->
+        <div class="content d-flex flex-column flex-column-fluid" id="kt_content">
+            <!--begin::Post-->
+            <div class="post d-flex flex-column-fluid" id="kt_post">
+                <!--begin::Container-->
+                <div id="kt_content_container" class="container-xxl">
+                    <!--begin::Row-->
+                    <div class="row g-5 g-xl-8">
+                        <!--begin::Col-->
+                        <div class="col-xl-3">
+                            <!--begin::Tables Widget 1-->
+                            <div class="card card-xl-stretch mb-xl-8">
+                                <!--begin::Header-->
+                                <div class="card-header border-0 pt-5">
+                                    <h3 class="card-title align-items-start flex-column">
+                                        <span class="card-label fw-bolder fs-3 mb-1">.</span>
+                                    </h3>
+
+                                </div>
+                                <!--end::Header-->
+                                <!--begin::Body-->
+                                <div class="card-body py-3">
+                                    <a href="/login" class="btn btn-primary btn-block btn-sm px-5">Home</a>
+                                </div>
+                            </div>
+                            <!--endW::Tables Widget 1-->
+                        </div>
+                        <!--end::Col-->
+                        <!--begin::Col-->
+                        <div class="col-xl-9">
+                            <!--begin::Tables Widget 2-->
+                            <div class="card card-xl-stretch mb-5 mb-xl-8">
+                                <!--begin::Header-->
+                                <div class="card-header border-0 pt-5">
+                                    <h3 class="card-title align-items-start flex-column">
+                                        <span class="card-label fw-bolder fs-3 mb-1"><?=$job_data->title?></span>
+                                    </h3>
+
+                                </div>
+                                <!--end::Header-->
+                                <!--begin::Body-->
+                                <div class="card-body py-3">
+                                    <!--begin::Table container-->
+                                    <div class="table-responsive">
+                                        <!--begin::Table-->
+
+                                        <?=$market_table?>
+
+
+                                        <!--end::Table-->
+                                    </div>
+                                    <!--end::Table container-->
+                                </div>
+                                <!--end::Body-->
+                            </div>
+                            <!--end::Tables Widget 2-->
+                        </div>
+                        <!--end::Col-->
+                    </div>
+                    <!--end::Row-->
+
+                </div>
+                <!--end::Container-->
+            </div>
+            <!--end::Post-->
+        </div>
+        <!--end::Content-->
+
+        <!--begin::Footer-->
+        <?php include("footer_links.php");?>
+    </div>
+</div>
+<script src="/site3/assets/plugins/global/plugins.bundle.js"></script>
+<script src="/site3/assets/js/scripts.bundle.js"></script>
+<script src="/site3/assets/js/custom/home/general.js"></script>
+</body>
+<!--end::Body-->
+</html>
+

www/application/views/site3/external/view_resetpass.php

@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="en">
+	<!--begin::Head-->
+	<head>
+		<meta name="title" content="WrenchBoard: Find a Freelancer  | Sell Professional Services" />
+        <?php include("header_contents.php");?>
+	</head>
+	<!--end::Head-->
+	<!--begin::Body-->
+	<body id="kt_body" class="bg-body">
+		<!--begin::Main-->
+		<!--begin::Root-->
+		<div class="d-flex flex-column flex-root">
+			<!--begin::Authentication - Password reset -->
+			<div class="d-flex flex-column flex-column-fluid bgi-position-y-bottom position-x-center bgi-no-repeat bgi-size-contain bgi-attachment-fixed" style="background-image: url(site3/assets/media/background/home.png">
+				<!--begin::Content-->
+				<div class="d-flex flex-center flex-column flex-column-fluid p-10 pb-lg-20">
+					<!--begin::Logo-->
+					<a href="/" class="mb-12">
+						<img alt="WrenchBoard" src="/assets/ext/images/wrenchboard.png" class="h-40px" />
+					</a>
+					<!--end::Logo-->
+					<!--begin::Wrapper-->
+					<div class="w-lg-500px bg-body rounded shadow-sm p-10 p-lg-15 mx-auto">
+						<!--begin::Form-->
+						<form class="form w-100" novalidate="novalidate" action="/password_recovery" method="POST">
+							<!--begin::Heading-->
+							<div class="text-center mb-10">
+								<!--begin::Title-->
+								<h1 class="text-dark mb-3">Forgot Password ?</h1>
+								<!--end::Title-->
+								<!--begin::Link-->
+								<div class="text-gray-400 fw-bold fs-4">Enter your email to reset your password.</div>
+								<!--end::Link-->
+							</div>
+							<!--begin::Heading-->
+							<!--begin::Input group-->
+							<div class="fv-row mb-10">
+								<label class="form-label fw-bolder text-gray-900 fs-6">Email</label>
+								<input class="form-control form-control-solid" type="email" placeholder="Your Username/Email" name="email" value="" autocomplete="off" />
+							</div>
+							<!--end::Input group-->
+							<!--begin::Actions-->
+							<?php echo $action_message; ?>
+							
+							<div class="d-flex flex-wrap justify-content-center pb-lg-0">
+								<button type="submit"  id="kt_password_reset_submit" class="btn btn-lg btn-primary fw-bolder me-4">
+									<span class="indicator-label">Submit</span>
+									<span class="indicator-progress">Please wait...
+									<span class="spinner-border spinner-border-sm align-middle ms-2"></span></span>
+								</button>
+								<a href="/" class="btn btn-lg btn-light-primary fw-bolder">Cancel</a>
+							</div>
+							<!--end::Actions-->
+						</form>
+						<!--end::Form-->
+					</div>
+					<!--end::Wrapper-->
+				</div>
+				<!--end::Content-->
+                <?php include("footer_links.php");?>
+			</div>
+		</div>
+		<script src="/site3/assets/plugins/global/plugins.bundle.js"></script>
+		<script src="/site3/assets/js/scripts.bundle.js"></script>
+		<script src="assets/js/custom/authentication/password-reset/password-reset.js"></script>
+	</body>
+	<!--end::Body-->
+</html>

www/application/views/site3/external/view_signup.php

@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="en">
+	<!--begin::Head-->
+	<head>
+		<meta name="title" content="WrenchBoard: Find a Freelancer  | Sell Professional Services" />
+        <?php include("header_contents.php");?>
+	</head>
+	<!--end::Head-->
+	<!--begin::Body-->
+	<body id="kt_body" class="bg-body">
+		<!--begin::Main-->
+		<!--begin::Root-->
+		<div class="d-flex flex-column flex-root">
+			<!--begin::Authentication - Sign-up -->
+			<div class="d-flex flex-column flex-column-fluid bgi-position-y-bottom position-x-center bgi-no-repeat bgi-size-contain bgi-attachment-fixed" style="background-image: url(site3/assets/media/background/home.png">
+				<!--begin::Content-->
+				<div class="d-flex flex-center flex-column flex-column-fluid p-10 pb-lg-20">
+					<!--begin::Logo-->
+					<a href="/" class="mb-12">
+						<img alt="WrenchBoard" src="/assets/ext/images/wrenchboard.png" class="h-40px" />
+					</a>
+					<!--end::Logo-->
+					<!--begin::Wrapper-->
+					<div class="w-lg-600px bg-body rounded shadow-sm p-10 p-lg-15 mx-auto">
+						<!--begin::Form-->
+						<form class="form w-100" action="signup" method="POST" id="registration">
+							<!--begin::Heading-->
+							<div class="mb-10 text-center">
+								<!--begin::Title-->
+								<h1 class="text-dark mb-3">Create an Account</h1>
+								<!--end::Title-->
+								<!--begin::Link-->
+								<div class="text-gray-400 fw-bold fs-4">Already have an account?
+								<a href="/" class="link-primary fw-bolder">Sign in here</a></div>
+								<!--end::Link-->
+							</div>
+							<!--end::Heading-->
+							<!--begin::Action-->
+							<!-- button type="button" class="btn btn-light-primary fw-bolder w-100 mb-10">
+							<img alt="Logo" src="/site3/assets/media/svg/brand-logos/google-icon.svg" class="h-20px me-3" />Sign in with Google</button -->
+							<!--end::Action-->
+							<!--begin::Action-->
+							<button type="button" class="btn btn-light-primary fw-bolder w-100 mb-10">
+							<img alt="Logo" src="/site3/assets/media/svg/brand-logos/facebook-4.svg" class="h-20px me-3" />Sign in with Facebook</button>
+							<!--end::Action-->
+							<!--begin::Separator-->
+							<div class="d-flex align-items-center mb-10">
+								<div class="border-bottom border-gray-300 mw-50 w-100"></div>
+								<span class="fw-bold text-gray-400 fs-7 mx-2">OR</span>
+								<div class="border-bottom border-gray-300 mw-50 w-100"></div>
+							</div>
+							<!--end::Separator-->
+							<!--begin::Input group-->
+							
+							
+							<!--begin::Input group-->
+							<div class="fv-row mb-7">
+								<label class="form-label fw-bolder text-dark fs-6">Country</label>
+								<?php echo $country_combo ?>
+							</div>
+							<!--end::Input group-->
+							
+							
+							<div class="row fv-row mb-7">
+								<!--begin::Col-->
+								<div class="col-xl-6">
+									<label class="form-label fw-bolder text-dark fs-6">First Name</label>
+									<input class="form-control form-control-lg form-control-solid" type="text" placeholder="Firstname" name="firstname" value="<?php echo $firstname;?>" required="required" autocomplete="off" />
+								</div>
+								<!--end::Col-->
+								<!--begin::Col-->
+								<div class="col-xl-6">
+									<label class="form-label fw-bolder text-dark fs-6">Last Name</label>
+									<input class="form-control form-control-lg form-control-solid" type="text" placeholder="Lastname" name="lastname" value="<?php echo $lastname;?>" required="required"  autocomplete="off" />
+								</div>
+								<!--end::Col-->
+							</div>
+							<!--end::Input group-->
+							<!--begin::Input group-->
+							<div class="fv-row mb-7">
+								<label class="form-label fw-bolder text-dark fs-6">Email</label>
+								<input class="form-control form-control-lg form-control-solid" type="email" placeholder="Your email-Username"  name="email" value="<?php echo $email;?>"  required="required"  autocomplete="off" />
+							</div>
+							<!--end::Input group-->
+							<!--begin::Input group-->
+							<div class="mb-10 fv-row" data-kt-password-meter="true">
+								<!--begin::Wrapper-->
+								<div class="mb-1">
+									<!--begin::Label-->
+									<label class="form-label fw-bolder text-dark fs-6">Password</label>
+									<!--end::Label-->
+									<!--begin::Input wrapper-->
+									<div class="position-relative mb-3">
+										<input class="form-control form-control-lg form-control-solid" type="password" placeholder="Create password" name="password"  required="required"  autocomplete="off" />
+										<span class="btn btn-sm btn-icon position-absolute translate-middle top-50 end-0 me-n2" data-kt-password-meter-control="visibility">
+											<i class="bi bi-eye-slash fs-2"></i>
+											<i class="bi bi-eye fs-2 d-none"></i>
+										</span>
+									</div>
+									<!--end::Input wrapper-->
+									<!--begin::Meter-->
+									<div class="d-flex align-items-center mb-3" data-kt-password-meter-control="highlight">
+										<div class="flex-grow-1 bg-secondary bg-active-success rounded h-5px me-2"></div>
+										<div class="flex-grow-1 bg-secondary bg-active-success rounded h-5px me-2"></div>
+										<div class="flex-grow-1 bg-secondary bg-active-success rounded h-5px me-2"></div>
+										<div class="flex-grow-1 bg-secondary bg-active-success rounded h-5px"></div>
+									</div>
+									<!--end::Meter-->
+								</div>
+								<!--end::Wrapper-->
+								<!--begin::Hint-->
+								<div class="text-muted">Use 8 or more characters with a mix of letters, numbers &amp; symbols.</div>
+								<!--end::Hint-->
+							</div>
+							<!--end::Input group=-->
+							<!--begin::Input group-->
+							<!-- div class="fv-row mb-5">
+								<label class="form-label fw-bolder text-dark fs-6">Confirm Password</label>
+								<input class="form-control form-control-lg form-control-solid" type="password" placeholder="" name="confirm-password"  required="required"  autocomplete="off" />
+							</div -->
+							<!--end::Input group-->
+							<!--begin::Input group-->
+							<div class="fv-row mb-10">
+								<label class="form-check form-check-custom form-check-solid form-check-inline">
+									<input class="form-check-input" type="checkbox" name="terms" <?=$terms?> required="required"  value="on" />
+									<span class="form-check-label fw-bold text-gray-700 fs-6">I Agree
+									<a href="#" class="ms-1 link-primary">Terms and conditions</a>.</span>
+								</label>
+							</div>
+							<!--end::Input group-->
+							<!--begin::Actions-->
+							<?php
+							 if (isset($signup_error_style) && $signup_error_style !=''){
+								 ?>
+									<div class="text-center">
+									  <? echo $signup_error_style; ?>
+									</div>	
+								 <?php
+							 }
+							?>
+
+							<div class="text-center">
+								<button type="button"  onclick="document.getElementById('registration').submit();" class="btn btn-lg btn-primary">
+									<span class="indicator-label">Submit</span>
+									<span class="indicator-progress">Please wait...
+									<span class="spinner-border spinner-border-sm align-middle ms-2"></span></span>
+								</button>
+							</div>
+							
+							
+							<!--end::Actions-->
+						</form>
+						<!--end::Form-->
+					</div>
+					<!--end::Wrapper-->
+				</div>
+				<!--end::Content-->
+                <?php include("footer_links.php");?>
+			</div>
+			<!--end::Authentication - Sign-up-->
+		</div>
+		<!--end::Root-->
+		<!--end::Main-->
+		<!--begin::Javascript-->
+		<!--begin::Global Javascript Bundle(used by all pages)-->
+		<script src="/site3/assets/plugins/global/plugins.bundle.js"></script>
+		<script src="/site3/assets/js/scripts.bundle.js"></script>
+		<script src="/site3/assets/js/custom/signup/general.js"></script>
+		<!--end::Page Custom Javascript-->
+		<!--end::Javascript-->
+	</body>
+	<!--end::Body-->
+</html>

www/application/views/site3/external/view_signup_started.php

@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html lang="en">
+	<!--begin::Head-->
+	<head>
+		<meta name="title" content="WrenchBoard: Find a Freelancer  | Sell Professional Services" />
+        <?php include("header_contents.php");?>
+	</head>
+	<!--end::Head-->
+	<!--begin::Body-->
+	<body id="kt_body" class="bg-body">
+		<!--begin::Main-->
+		<!--begin::Root-->
+		<div class="d-flex flex-column flex-root">
+			<!--begin::Authentication - Password reset -->
+			<div class="d-flex flex-column flex-column-fluid bgi-position-y-bottom position-x-center bgi-no-repeat bgi-size-contain bgi-attachment-fixed" style="background-image: url(site3/assets/media/background/home.png">
+				<!--begin::Content-->
+				<div class="d-flex flex-center flex-column flex-column-fluid p-10 pb-lg-20">
+					<!--begin::Logo-->
+					<a href="/" class="mb-12">
+						<img alt="WrenchBoard" src="/assets/ext/images/wrenchboard.png" class="h-40px" />
+					</a>
+					<!--end::Logo-->
+					<!--begin::Wrapper-->
+					<div class="w-lg-500px bg-body rounded shadow-sm p-10 p-lg-15 mx-auto">
+						<!--begin::Form-->
+						<form class="form w-100" novalidate="novalidate" action="/" method="POST">
+							<!--begin::Heading-->
+							<div class="text-center mb-10">
+								<!--begin::Title-->
+								<h1 class="text-dark mb-3">Let's verify your email now. </h1>
+								<!--end::Title-->
+								<!--begin::Link-->
+								<div class="text-gray-400 fw-bold fs-4">check your email.</div>
+								<!--end::Link-->
+							</div>
+							<!--begin::Heading-->
+							<!--begin::Input group-->
+							<div class="fv-row mb-10">
+								<label class="form-label fw-bolder text-gray-900 fs-6"><? echo $page_title; ?></label>
+								
+								Help us secure your WrenchBoard account by verifying your email registration address. Verification will let you access all of WrenchBoard's features. 
+								<hr size="1"> 
+								 If you do not receive the confirmation message within a few minutes of signing up, please check your Junk E-mail folder just in case the confirmation email got delivered there instead of your inbox. If so, select the confirmation message and click Not Junk, which will allow future messages to get through.
+							</div>
+							
+							
+							<div class="d-flex flex-wrap justify-content-center pb-lg-0">
+								<a href="/" class="btn btn-lg btn-light-primary fw-bolder">Return Home</a>
+							</div>
+						</form>
+						<!--end::Form-->
+					</div>
+					<!--end::Wrapper-->
+				</div>
+				<!--end::Content-->
+                <?php include("footer_links.php");?>
+			</div>
+		</div>
+		<script src="/site3/assets/plugins/global/plugins.bundle.js"></script>
+		<script src="/site3/assets/js/scripts.bundle.js"></script>
+		<script src="assets/js/custom/authentication/password-reset/password-reset.js"></script>
+	</body>
+	<!--end::Body-->
+</html>

www/application/views/site3/internal/template/view_securefooter.php

@@ -0,0 +1,68 @@
+
+</div>
+<!--end::Container-->
+</div>
+<!--end::Post-->
+</div>
+<!--end::Content-->
+<!--begin::Footer-->
+<div class="footer py-4 d-flex flex-lg-column" id="kt_footer">
+    <!--begin::Container-->
+    <div class="container-fluid d-flex flex-column flex-md-row align-items-center justify-content-between">
+        <!--begin::Copyright-->
+        <div class="text-dark order-2 order-md-1">
+            <span class="text-muted fw-bold me-1">2022©</span>
+            <a href="/dash" target="_blank" class="text-gray-800 text-hover-primary">WrenchBoard</a>
+        </div>
+        <!--end::Copyright-->
+        <!--begin::Menu-->
+        <ul class="menu menu-gray-600 menu-hover-primary fw-bold order-1">
+            <li class="menu-item">
+                <a href="/dash" target="_blank" class="menu-link px-2">Home</a>
+            </li>
+            <li class="menu-item">
+                <a href="/jobs/jobgrp" target="_blank" class="menu-link px-2">Job Group</a>
+            </li>
+            <li class="menu-item">
+                <a href="/member/yourpage" target="_blank" class="menu-link px-2">My Page</a>
+            </li>
+            <li class="menu-item">
+                <a href="/member/payments" target="_blank" class="menu-link px-2">Payments</a>
+            </li>
+            <li class="menu-item">
+                <a href="/member/faq" target="_blank" class="menu-link px-2">FAQ's</a>
+            </li>
+            <li class="menu-item">
+                <a href="/member/support" target="_blank" class="menu-link px-2">Support</a>
+            </li>
+        </ul>
+        <!--end::Menu-->
+    </div>
+    <!--end::Container-->
+</div>
+<!--end::Footer-->
+</div>
+<!--end::Wrapper-->
+</div>
+<!--end::Page-->
+</div>
+<!--end::Root-->
+
+
+
+<!--end::Modals-->
+<!--begin::Javascript-->
+
+<!--begin::Global Javascript Bundle(used by all pages)-->
+<script src="/site3/assets/plugins/global/plugins.bundle.js"></script>
+<script src="/site3/assets/js/scripts.bundle.js"></script>
+<!--begin::Page Custom Javascript(used by this page)-->
+<script src="/site3/assets/js/widgets.bundle.js"></script>
+<script src="/site3/assets/js/custom/widgets.js"></script>
+<script src="/site3/assets/js/custom/utilities/modals/users-search.js"></script>
+<!--end::Page Custom Javascript-->
+<!--end::Javascript-->
+</body>
+<!--end::Body-->
+
+</html>

www/application/views/site3/internal/template/view_securehead.php

@@ -0,0 +1,679 @@
+<!DOCTYPE html>
+<?php
+//var_dump($_SERVER);
+$server_name = 'https://'. $_SERVER['HTTP_HOST'];
+//exit;
+?>
+<html lang="en">
+	<!--begin::Head-->
+	<head>
+		<title>WrenchBoard -<?php echo $_SESSION['firstname']; ?> </title>
+		<meta charset="utf-8" />
+		<meta http-equiv="refresh" content="<?php echo SESSION_TIMEOUT_LOGOUT; ?>;url=/logout">
+		<meta name="description" content="wrenchboard.com is an online marketplace to make money from your skills, find, buy and sell professional services. Connect with freelancers to get work done faster. Trade your freelance services." />
+        <meta name="keywords" content="Online Jobs, Online Workers, work online Nigeria, hire a freelancer, hire freelancers, freelance marketplace, freelancer hire, freelance service, freelance professional services, How to make money online, find workers online, Online Services, digital services, freelancers community in Ghana, freelancers community in Nigeria, freelancer site in Africa, Best freelance website in Africa,  Freelance Designers, Photographers,  Writers in Nigeria, freelancers, freelance outsourcing in Nigeria, freelance IT services in Nigeria, hire freelancers online in Nigeria, freelance services online in Nigeria, freelance contractor in Nigeria, freelance sites in Nigeria, freelance jobs in Nigeria, freelance projects in Nigeria, freelance jobs online in Nigeria, professional freelancers in Nigeria, buy professional services in Nigeria, professional services jobs, professional business services, professional service providers in Nigeria, freelancing services, freelancing sites in Nigeria, freelancers for hire in Nigeria, freelancer search in Nigeria, search freelancer in Nigeria, find freelancers in Nigeria, Find workers US. Outsource from US to Nigeria, find a freelancer in Nigeria, freelancing projects in Nigeria, web freelancing in Nigeria, outsourcing sites freelancers in Nigeria, website for freelancers in Nigeria, marketplace for freelancers " />
+		<meta name="keywords" content="Metronic, bootstrap, bootstrap 5, Angular, VueJs, React, Laravel, admin themes, web design, figma, web development, free templates, free admin themes, bootstrap theme, bootstrap template, bootstrap dashboard, bootstrap dak mode, bootstrap button, bootstrap datepicker, bootstrap timepicker, fullcalendar, datatables, flaticon" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<meta property="og:locale" content="en_US" />
+		<meta property="og:type" content="article" />
+		<meta property="og:title" content="WrenchBoard: Find a Freelancer  | Sell Professional Services" />
+		<meta property="og:url" content="<?=$server_name?>" />
+		<meta property="og:site_name" content="WrenchBoard" />
+		<link rel="canonical" href="<?=$server_name?>" />
+        <link rel="shortcut icon" href="<?=$server_name?>/assets/ext/images/favicon.png">
+		<!--begin::Fonts-->
+		<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700" />
+		<!--end::Fonts-->
+
+		<!--begin::Global Stylesheets Bundle(used by all pages)-->
+		<link href="<?=$server_name?>/site3/assets/plugins/global/plugins.bundle.css" rel="stylesheet" type="text/css" />
+		<link href="<?=$server_name?>/site3/assets/css/style.bundle.css" rel="stylesheet" type="text/css" />
+		<!--end::Global Stylesheets Bundle-->
+		<style>
+            .h-lg-45px {
+                height: 45px!important;
+            }
+            .header-brand{
+                background-color: #1e1ffd;
+            }
+
+        </style>
+	</head>
+	<!--end::Head-->
+
+	<!--begin::Body-->
+	<body id="kt_body" class="header-tablet-and-mobile-fixed aside-enabled">
+		<!--begin::Main-->
+		<!--begin::Root-->
+		<div class="d-flex flex-column flex-root">
+			<!--begin::Page-->
+			<div class="page d-flex flex-row flex-column-fluid">
+				<!--begin::Aside-->
+				<div id="kt_aside" class="aside" data-kt-drawer="true" data-kt-drawer-name="aside" data-kt-drawer-activate="{default: true, lg: false}" data-kt-drawer-overlay="true" data-kt-drawer-width="{default:'200px', '300px': '250px'}" data-kt-drawer-direction="start" data-kt-drawer-toggle="#kt_aside_mobile_toggle">
+					<!--begin::Aside Toolbarl-->
+					<div class="aside-toolbar flex-column-auto" id="kt_aside_toolbar">
+						<!--begin::Aside user-->
+						<!--begin::User-->
+						<div class="aside-user d-flex align-items-sm-center justify-content-center py-5">
+							<!--begin::Symbol-->
+							<div class="symbol symbol-50px">
+								<img src="<? echo $_SESSION['profile_picture']; ?>" alt="" />
+							</div>
+							<!--end::Symbol-->
+							<!--begin::Wrapper-->
+							<div class="aside-user-info flex-row-fluid flex-wrap ms-5">
+								<!--begin::Section-->
+								<div class="d-flex">
+									<!--begin::Info-->
+									<div class="flex-grow-1 me-2">
+										<!--begin::Username-->
+										<a href="#" class="text-white text-hover-primary fs-6 fw-bold"><?php echo $firstname; ?></a>
+										<!--end::Username-->
+										<!--begin::Description-->
+										<span class="text-gray-600 fw-bold d-block fs-8 mb-1"><hr></span>
+										<!--end::Description-->
+										<!--begin::Label-->
+										<div class="d-flex align-items-center text-success fs-9">
+										<span class="bullet bullet-dot bg-success me-1"></span>online</div>
+										<!--end::Label-->
+									</div>
+									<!--end::Info-->
+									<!--begin::User menu-->
+									<div class="me-n2">
+										<!--begin::Action-->
+										<a href="#" class="btn btn-icon btn-sm btn-active-color-primary mt-n2" data-kt-menu-trigger="click" data-kt-menu-placement="bottom-start" data-kt-menu-overflow="true">
+											<!--begin::Svg Icon | path: icons/duotune/coding/cod001.svg-->
+											<span class="svg-icon svg-icon-muted svg-icon-1">
+												<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+													<path opacity="0.3" d="M22.1 11.5V12.6C22.1 13.2 21.7 13.6 21.2 13.7L19.9 13.9C19.7 14.7 19.4 15.5 18.9 16.2L19.7 17.2999C20 17.6999 20 18.3999 19.6 18.7999L18.8 19.6C18.4 20 17.8 20 17.3 19.7L16.2 18.9C15.5 19.3 14.7 19.7 13.9 19.9L13.7 21.2C13.6 21.7 13.1 22.1 12.6 22.1H11.5C10.9 22.1 10.5 21.7 10.4 21.2L10.2 19.9C9.4 19.7 8.6 19.4 7.9 18.9L6.8 19.7C6.4 20 5.7 20 5.3 19.6L4.5 18.7999C4.1 18.3999 4.1 17.7999 4.4 17.2999L5.2 16.2C4.8 15.5 4.4 14.7 4.2 13.9L2.9 13.7C2.4 13.6 2 13.1 2 12.6V11.5C2 10.9 2.4 10.5 2.9 10.4L4.2 10.2C4.4 9.39995 4.7 8.60002 5.2 7.90002L4.4 6.79993C4.1 6.39993 4.1 5.69993 4.5 5.29993L5.3 4.5C5.7 4.1 6.3 4.10002 6.8 4.40002L7.9 5.19995C8.6 4.79995 9.4 4.39995 10.2 4.19995L10.4 2.90002C10.5 2.40002 11 2 11.5 2H12.6C13.2 2 13.6 2.40002 13.7 2.90002L13.9 4.19995C14.7 4.39995 15.5 4.69995 16.2 5.19995L17.3 4.40002C17.7 4.10002 18.4 4.1 18.8 4.5L19.6 5.29993C20 5.69993 20 6.29993 19.7 6.79993L18.9 7.90002C19.3 8.60002 19.7 9.39995 19.9 10.2L21.2 10.4C21.7 10.5 22.1 11 22.1 11.5ZM12.1 8.59998C10.2 8.59998 8.6 10.2 8.6 12.1C8.6 14 10.2 15.6 12.1 15.6C14 15.6 15.6 14 15.6 12.1C15.6 10.2 14 8.59998 12.1 8.59998Z" fill="black" />
+													<path d="M17.1 12.1C17.1 14.9 14.9 17.1 12.1 17.1C9.30001 17.1 7.10001 14.9 7.10001 12.1C7.10001 9.29998 9.30001 7.09998 12.1 7.09998C14.9 7.09998 17.1 9.29998 17.1 12.1ZM12.1 10.1C11 10.1 10.1 11 10.1 12.1C10.1 13.2 11 14.1 12.1 14.1C13.2 14.1 14.1 13.2 14.1 12.1C14.1 11 13.2 10.1 12.1 10.1Z" fill="black" />
+												</svg>
+											</span>
+											<!--end::Svg Icon-->
+										</a>
+										<!--begin::User account menu-->
+										<div class="menu menu-sub menu-sub-dropdown menu-column menu-rounded menu-gray-800 menu-state-bg menu-state-primary fw-bold py-4 fs-6 w-275px" data-kt-menu="true">
+											<!--begin::Menu item-->
+											<div class="menu-item px-3">
+												<div class="menu-content d-flex align-items-center px-3">
+													<!--begin::Avatar-->
+													<div class="symbol symbol-50px me-5">
+														<img alt="Logo" src="<?=$server_name?>/assets/ext/images/wrenchboard.png" />
+													</div>
+													<!--end::Avatar-->
+													<!--begin::Username-->
+													<div class="d-flex flex-column">
+														<div class="fw-bolder d-flex align-items-center fs-5"><?php echo $firstname; ?>
+														<span class="badge badge-light-success fw-bolder fs-8 px-2 py-1 ms-2"></span></div>
+														<a href="#" class="fw-bold text-muted text-hover-primary fs-7"><?=$_SESSION['username']?></a>
+													</div>
+													<!--end::Username-->
+												</div>
+											</div>
+											<!--end::Menu item-->
+											<!--begin::Menu separator-->
+											<div class="separator my-2"></div>
+											<!--end::Menu separator-->
+											<!--begin::Menu item-->
+											<div class="menu-item px-5">
+												<a href="/member/profile" class="menu-link px-5">My Profile</a>
+											</div>
+											<!--end::Menu item-->
+											<!--begin::Menu item-->
+											<div class="menu-item px-5">
+												<a href="/member/balance" class="menu-link px-5">
+													<span class="menu-text">My Wallet</span>
+												</a>
+											</div>
+											<!--end::Menu item-->
+											<!--begin::Menu item-->
+											<div class="menu-item px-5" data-kt-menu-trigger="hover" data-kt-menu-placement="right-start">
+												<a href="#" class="menu-link px-5">
+													<span class="menu-title">Reports</span>
+													<span class="menu-arrow"></span>
+												</a>
+												<!--begin::Menu sub-->
+												<div class="menu-sub menu-sub-dropdown w-175px py-4">
+													<!--begin::Menu item-->
+													<div class="menu-item px-3">
+														<a href="#" class="menu-link px-5">Referrals</a>
+													</div>
+													<!--end::Menu item-->
+													<!--begin::Menu item-->
+													<div class="menu-item px-3">
+														<a href="#" class="menu-link px-5">Billing</a>
+													</div>
+													<!--end::Menu item-->
+													<!--begin::Menu item-->
+													<div class="menu-item px-3">
+														<a href="/member/payments" class="menu-link px-5">Payments</a>
+													</div>
+													<!--end::Menu item-->
+													<!--begin::Menu item-->
+													<div class="menu-item px-3">
+														<a href="/proj/complete" class="menu-link d-flex flex-stack px-5">Completed Jobs
+														<i class="fas fa-exclamation-circle ms-2 fs-7" data-bs-toggle="tooltip" title="View your statements"></i></a>
+													</div>
+													<!--end::Menu item-->
+													<!--begin::Menu separator-->
+													<div class="separator my-2"></div>
+													<!--end::Menu separator-->
+													<!--begin::Menu item-->
+													<div class="menu-item px-3">
+														<div class="menu-content px-3">
+															<label class="form-check form-switch form-check-custom form-check-solid">
+																<input class="form-check-input w-30px h-20px" type="checkbox" value="1" checked="checked" name="notifications" />
+																<span class="form-check-label text-muted fs-7">Notifications</span>
+															</label>
+														</div>
+													</div>
+													<!--end::Menu item-->
+												</div>
+												<!--end::Menu sub-->
+											</div>
+											<!--end::Menu item-->
+											<!--begin::Menu item-->
+											<div class="menu-item px-5">
+												<a href="" class="menu-link px-5">My Statements</a>
+											</div>
+											<!--end::Menu item-->
+											<!--begin::Menu separator-->
+											<div class="separator my-2"></div>
+											<!--end::Menu separator-->
+											<!--begin::Menu item-->
+											<div class="menu-item px-5" data-kt-menu-trigger="hover" data-kt-menu-placement="right-start">
+												<a href="#" class="menu-link px-5">
+													<span class="menu-title position-relative">Language
+													<span class="fs-8 rounded bg-light px-3 py-2 position-absolute translate-middle-y top-50 end-0">English
+													<img class="w-15px h-15px rounded-1 ms-2" src="<?=$server_name?>/site3/assets/media/flags/united-states.svg" alt="" /></span></span>
+												</a>
+												<!--begin::Menu sub-->
+												<div class="menu-sub menu-sub-dropdown w-175px py-4">
+													<!--begin::Menu item-->
+													<div class="menu-item px-3">
+														<a href="" class="menu-link d-flex px-5 active">
+														<span class="symbol symbol-20px me-4">
+															<img class="rounded-1" src="<?=$server_name?>/site3/assets/media/flags/united-states.svg" alt="" />
+														</span>English</a>
+													</div>
+													<!--end::Menu item-->
+													<!--begin::Menu item-->
+													<div class="menu-item px-3">
+														<a href="" class="menu-link d-flex px-5">
+														<span class="symbol symbol-20px me-4">
+															<img class="rounded-1" src="<?=$server_name?>/site3/assets/media/flags/spain.svg" alt="" />
+														</span>Spanish</a>
+													</div>
+													<!--end::Menu item-->
+													<!--begin::Menu item-->
+													<div class="menu-item px-3">
+														<a href="" class="menu-link d-flex px-5">
+														<span class="symbol symbol-20px me-4">
+															<img class="rounded-1" src="<?=$server_name?>/site3/assets/media/flags/germany.svg" alt="" />
+														</span>German</a>
+													</div>
+													<!--end::Menu item-->
+													<!--begin::Menu item-->
+													<div class="menu-item px-3">
+														<a href="" class="menu-link d-flex px-5">
+														<span class="symbol symbol-20px me-4">
+															<img class="rounded-1" src="<?=$server_name?>/site3/assets/media/flags/japan.svg" alt="" />
+														</span>Japanese</a>
+													</div>
+													<!--end::Menu item-->
+													<!--begin::Menu item-->
+													<div class="menu-item px-3">
+														<a href="" class="menu-link d-flex px-5">
+														<span class="symbol symbol-20px me-4">
+															<img class="rounded-1" src="<?=$server_name?>/site3/assets/media/flags/france.svg" alt="" />
+														</span>French</a>
+													</div>
+													<!--end::Menu item-->
+												</div>
+												<!--end::Menu sub-->
+											</div>
+											<!--end::Menu item-->
+											<!--begin::Menu item-->
+											<div class="menu-item px-5 my-1">
+												<a href="/member/settings" class="menu-link px-5">Account Settings</a>
+											</div>
+											<!--end::Menu item-->
+											<!--begin::Menu item-->
+											<div class="menu-item px-5">
+												<a href="/logout" class="menu-link px-5">Sign Out</a>
+											</div>
+											<!--end::Menu item-->
+											<!--begin::Menu separator-->
+											<div class="separator my-2"></div>
+											<!--end::Menu separator-->
+											<!--begin::Menu item-->
+
+											<!--end::Menu item-->
+										</div>
+										<!--end::User account menu-->
+										<!--end::Action-->
+									</div>
+									<!--end::User menu-->
+								</div>
+								<!--end::Section-->
+							</div>
+							<!--end::Wrapper-->
+						</div>
+						<!--end::User-->
+
+						<!--end::Aside user-->
+					</div>
+					<!--end::Aside Toolbarl-->
+					<!--begin::Aside menu-->
+					<div class="aside-menu flex-column-fluid">
+						<!--begin::Aside Menu-->
+						<div class="hover-scroll-overlay-y px-2 my-5 my-lg-5" id="kt_aside_menu_wrapper" data-kt-scroll="true" data-kt-scroll-height="auto" data-kt-scroll-dependencies="{default: '#kt_aside_toolbar, #kt_aside_footer', lg: '#kt_header, #kt_aside_toolbar, #kt_aside_footer'}" data-kt-scroll-wrappers="#kt_aside_menu" data-kt-scroll-offset="5px">
+							<!--begin::Menu-->
+							<div class="menu menu-column menu-title-gray-800 menu-state-title-primary menu-state-icon-primary menu-state-bullet-primary menu-arrow-gray-500" id="#kt_aside_menu" data-kt-menu="true">
+
+                                <a href="/dash">
+                                    <div  class="menu-item">
+                                     <span class="menu-link">
+                                    <span class="menu-icon">
+                                    <!--begin::Svg Icon | path: icons/duotune/general/gen025.svg-->
+                                    <span class="svg-icon svg-icon-2">
+                                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                                        <rect x="2" y="2" width="9" height="9" rx="2" fill="black" />
+                                        <rect opacity="0.3" x="13" y="2" width="9" height="9" rx="2" fill="black" />
+                                        <rect opacity="0.3" x="13" y="13" width="9" height="9" rx="2" fill="black" />
+                                        <rect opacity="0.3" x="2" y="13" width="9" height="9" rx="2" fill="black" />
+                                    </svg>
+                                    </span>
+                                    <!--end::Svg Icon-->
+                                    </span>
+                                    <span class="menu-title">Dashboard</span>
+                                    </span>
+                                    </div>
+                                </a>
+
+                                <a href="/jobs/market">
+                                    <div  class="menu-item">
+                                     <span class="menu-link">
+                                    <span class="menu-icon">
+                                    <!--begin::Svg Icon | path: icons/duotune/general/gen025.svg-->
+                                    <span class="svg-icon svg-icon-2">
+                                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                                        <rect x="2" y="2" width="9" height="9" rx="2" fill="black" />
+                                        <rect opacity="0.3" x="13" y="2" width="9" height="9" rx="2" fill="black" />
+                                        <rect opacity="0.3" x="13" y="13" width="9" height="9" rx="2" fill="black" />
+                                        <rect opacity="0.3" x="2" y="13" width="9" height="9" rx="2" fill="black" />
+                                    </svg>
+                                    </span>
+                                        <!--end::Svg Icon-->
+                                    </span>
+                                    <span class="menu-title">Market</span>
+                                    </span>
+                                    </div>
+                                </a>
+
+								<div class="menu-item">
+									<div class="menu-content pt-8 pb-2">
+										<span class="menu-section text-muted text-uppercase fs-8 ls-1">Activities</span>
+									</div>
+								</div>
+                                <a href="/proj/active" >
+                                    <div  class="menu-item">
+									<span class="menu-link">
+
+
+
+										<span class="menu-icon">
+											<!--begin::Svg Icon | path: icons/duotune/ecommerce/ecm007.svg-->
+											<span class="svg-icon svg-icon-2">
+												<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+													<path d="M21 9V11C21 11.6 20.6 12 20 12H14V8H20C20.6 8 21 8.4 21 9ZM10 8H4C3.4 8 3 8.4 3 9V11C3 11.6 3.4 12 4 12H10V8Z" fill="black" />
+													<path d="M15 2C13.3 2 12 3.3 12 5V8H15C16.7 8 18 6.7 18 5C18 3.3 16.7 2 15 2Z" fill="black" />
+													<path opacity="0.3" d="M9 2C10.7 2 12 3.3 12 5V8H9C7.3 8 6 6.7 6 5C6 3.3 7.3 2 9 2ZM4 12V21C4 21.6 4.4 22 5 22H10V12H4ZM20 12V21C20 21.6 19.6 22 19 22H14V12H20Z" fill="black" />
+												</svg>
+											</span>
+                                            <!--end::Svg Icon-->
+										</span>
+										<span class="menu-title"> Active Job(s)</span>
+									</span>
+                                    </div>
+                                </a>
+
+                                <a href="/member/yourpage" >
+                                    <div  class="menu-item">
+                                            <span class="menu-link">
+                                                <span class="menu-icon">
+                                                    <!--begin::Svg Icon | path: icons/duotune/communication/com013.svg-->
+                                                    <span class="svg-icon svg-icon-2">
+                                                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                                                            <path d="M6.28548 15.0861C7.34369 13.1814 9.35142 12 11.5304 12H12.4696C14.6486 12 16.6563 13.1814 17.7145 15.0861L19.3493 18.0287C20.0899 19.3618 19.1259 21 17.601 21H6.39903C4.87406 21 3.91012 19.3618 4.65071 18.0287L6.28548 15.0861Z" fill="black" />
+                                                            <rect opacity="0.3" x="8" y="3" width="8" height="8" rx="4" fill="black" />
+                                                        </svg>
+                                                    </span>
+                                                    <!--end::Svg Icon-->
+                                                </span>
+                                                <span class="menu-title">My Page</span>
+                                            </span>
+                                    </div>
+                                </a>
+
+                                <a href="/member/message" >
+                                    <div  class="menu-item">
+                                            <span class="menu-link">
+                                                <span class="menu-icon">
+                                                    <!--begin::Svg Icon | path: icons/duotune/communication/com013.svg-->
+                                                    <span class="svg-icon svg-icon-2">
+                                                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                                                            <path d="M6.28548 15.0861C7.34369 13.1814 9.35142 12 11.5304 12H12.4696C14.6486 12 16.6563 13.1814 17.7145 15.0861L19.3493 18.0287C20.0899 19.3618 19.1259 21 17.601 21H6.39903C4.87406 21 3.91012 19.3618 4.65071 18.0287L6.28548 15.0861Z" fill="black" />
+                                                            <rect opacity="0.3" x="8" y="3" width="8" height="8" rx="4" fill="black" />
+                                                        </svg>
+                                                    </span>
+                                                    <!--end::Svg Icon-->
+                                                </span>
+                                                <span class="menu-title">Messages</span>
+                                            </span>
+                                    </div>
+                                </a>
+
+
+
+
+
+
+
+								<div class="menu-item">
+									<div class="menu-content pt-8 pb-2">
+										<span class="menu-section text-muted text-uppercase fs-8 ls-1">Job(s) Management</span>
+									</div>
+								</div>
+
+                                <?php
+                                if (isset($_SESSION["post_jobs"]) && $_SESSION["post_jobs"] != '') {
+                                    ?>
+                                    <a href="/jobs/manage">
+                                    <div  class="menu-item">
+									<span class="menu-link">
+										<span class="menu-icon">
+											<!--begin::Svg Icon | path: icons/duotune/general/gen002.svg-->
+											<span class="svg-icon svg-icon-2">
+												<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+													<path opacity="0.3" d="M4.05424 15.1982C8.34524 7.76818 13.5782 3.26318 20.9282 2.01418C21.0729 1.98837 21.2216 1.99789 21.3618 2.04193C21.502 2.08597 21.6294 2.16323 21.7333 2.26712C21.8372 2.37101 21.9144 2.49846 21.9585 2.63863C22.0025 2.7788 22.012 2.92754 21.9862 3.07218C20.7372 10.4222 16.2322 15.6552 8.80224 19.9462L4.05424 15.1982ZM3.81924 17.3372L2.63324 20.4482C2.58427 20.5765 2.5735 20.7163 2.6022 20.8507C2.63091 20.9851 2.69788 21.1082 2.79503 21.2054C2.89218 21.3025 3.01536 21.3695 3.14972 21.3982C3.28408 21.4269 3.42387 21.4161 3.55224 21.3672L6.66524 20.1802L3.81924 17.3372ZM16.5002 5.99818C16.2036 5.99818 15.9136 6.08615 15.6669 6.25097C15.4202 6.41579 15.228 6.65006 15.1144 6.92415C15.0009 7.19824 14.9712 7.49984 15.0291 7.79081C15.0869 8.08178 15.2298 8.34906 15.4396 8.55884C15.6494 8.76862 15.9166 8.91148 16.2076 8.96935C16.4986 9.02723 16.8002 8.99753 17.0743 8.884C17.3484 8.77046 17.5826 8.5782 17.7474 8.33153C17.9123 8.08486 18.0002 7.79485 18.0002 7.49818C18.0002 7.10035 17.8422 6.71882 17.5609 6.43752C17.2796 6.15621 16.8981 5.99818 16.5002 5.99818Z" fill="black" />
+													<path d="M4.05423 15.1982L2.24723 13.3912C2.15505 13.299 2.08547 13.1867 2.04395 13.0632C2.00243 12.9396 1.9901 12.8081 2.00793 12.679C2.02575 12.5498 2.07325 12.4266 2.14669 12.3189C2.22013 12.2112 2.31752 12.1219 2.43123 12.0582L9.15323 8.28918C7.17353 10.3717 5.4607 12.6926 4.05423 15.1982ZM8.80023 19.9442L10.6072 21.7512C10.6994 21.8434 10.8117 21.9129 10.9352 21.9545C11.0588 21.996 11.1903 22.0083 11.3195 21.9905C11.4486 21.9727 11.5718 21.9252 11.6795 21.8517C11.7872 21.7783 11.8765 21.6809 11.9402 21.5672L15.7092 14.8442C13.6269 16.8245 11.3061 18.5377 8.80023 19.9442ZM7.04023 18.1832L12.5832 12.6402C12.7381 12.4759 12.8228 12.2577 12.8195 12.032C12.8161 11.8063 12.725 11.5907 12.5653 11.4311C12.4057 11.2714 12.1901 11.1803 11.9644 11.1769C11.7387 11.1736 11.5205 11.2583 11.3562 11.4132L5.81323 16.9562L7.04023 18.1832Z" fill="black" />
+												</svg>
+											</span>
+                                            <!--end::Svg Icon-->
+										</span>
+										<span class="menu-title">My Jobs</span>
+									</span>
+                                    </div>
+                                    </a>
+                                    <?php
+                                    if ($_SESSION["active_offers_count"] > 0) {
+                                        ?>
+                                        <<a href="/jobs/pendingoffer">
+                                            <div  class="menu-item">
+                                                <span class="menu-link">
+                                                    <span class="menu-icon">
+                                                        <!--begin::Svg Icon | path: icons/duotune/general/gen002.svg-->
+                                                        <span class="svg-icon svg-icon-2">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                                                                <path opacity="0.3" d="M4.05424 15.1982C8.34524 7.76818 13.5782 3.26318 20.9282 2.01418C21.0729 1.98837 21.2216 1.99789 21.3618 2.04193C21.502 2.08597 21.6294 2.16323 21.7333 2.26712C21.8372 2.37101 21.9144 2.49846 21.9585 2.63863C22.0025 2.7788 22.012 2.92754 21.9862 3.07218C20.7372 10.4222 16.2322 15.6552 8.80224 19.9462L4.05424 15.1982ZM3.81924 17.3372L2.63324 20.4482C2.58427 20.5765 2.5735 20.7163 2.6022 20.8507C2.63091 20.9851 2.69788 21.1082 2.79503 21.2054C2.89218 21.3025 3.01536 21.3695 3.14972 21.3982C3.28408 21.4269 3.42387 21.4161 3.55224 21.3672L6.66524 20.1802L3.81924 17.3372ZM16.5002 5.99818C16.2036 5.99818 15.9136 6.08615 15.6669 6.25097C15.4202 6.41579 15.228 6.65006 15.1144 6.92415C15.0009 7.19824 14.9712 7.49984 15.0291 7.79081C15.0869 8.08178 15.2298 8.34906 15.4396 8.55884C15.6494 8.76862 15.9166 8.91148 16.2076 8.96935C16.4986 9.02723 16.8002 8.99753 17.0743 8.884C17.3484 8.77046 17.5826 8.5782 17.7474 8.33153C17.9123 8.08486 18.0002 7.79485 18.0002 7.49818C18.0002 7.10035 17.8422 6.71882 17.5609 6.43752C17.2796 6.15621 16.8981 5.99818 16.5002 5.99818Z" fill="black" />
+                                                                <path d="M4.05423 15.1982L2.24723 13.3912C2.15505 13.299 2.08547 13.1867 2.04395 13.0632C2.00243 12.9396 1.9901 12.8081 2.00793 12.679C2.02575 12.5498 2.07325 12.4266 2.14669 12.3189C2.22013 12.2112 2.31752 12.1219 2.43123 12.0582L9.15323 8.28918C7.17353 10.3717 5.4607 12.6926 4.05423 15.1982ZM8.80023 19.9442L10.6072 21.7512C10.6994 21.8434 10.8117 21.9129 10.9352 21.9545C11.0588 21.996 11.1903 22.0083 11.3195 21.9905C11.4486 21.9727 11.5718 21.9252 11.6795 21.8517C11.7872 21.7783 11.8765 21.6809 11.9402 21.5672L15.7092 14.8442C13.6269 16.8245 11.3061 18.5377 8.80023 19.9442ZM7.04023 18.1832L12.5832 12.6402C12.7381 12.4759 12.8228 12.2577 12.8195 12.032C12.8161 11.8063 12.725 11.5907 12.5653 11.4311C12.4057 11.2714 12.1901 11.1803 11.9644 11.1769C11.7387 11.1736 11.5205 11.2583 11.3562 11.4132L5.81323 16.9562L7.04023 18.1832Z" fill="black" />
+                                                            </svg>
+                                                        </span>
+                                                        <!--end::Svg Icon-->
+                                                    </span>
+                                                    <span class="menu-title">my Market Jobs[<?php echo $_SESSION["active_offers_count"]; ?>]</span>
+                                                </span>
+                                            </div>
+
+                                            </a>
+                                        <?
+                                    }
+                                    ?>
+                                    <a href="/jobs/offerinterest">
+                                    <div  class="menu-item">
+									<span class="menu-link">
+										<span class="menu-icon">
+											<!--begin::Svg Icon | path: icons/duotune/graphs/gra006.svg-->
+											<span class="svg-icon svg-icon-2">
+												<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+													<path d="M13 5.91517C15.8 6.41517 18 8.81519 18 11.8152C18 12.5152 17.9 13.2152 17.6 13.9152L20.1 15.3152C20.6 15.6152 21.4 15.4152 21.6 14.8152C21.9 13.9152 22.1 12.9152 22.1 11.8152C22.1 7.01519 18.8 3.11521 14.3 2.01521C13.7 1.91521 13.1 2.31521 13.1 3.01521V5.91517H13Z" fill="black" />
+													<path opacity="0.3" d="M19.1 17.0152C19.7 17.3152 19.8 18.1152 19.3 18.5152C17.5 20.5152 14.9 21.7152 12 21.7152C9.1 21.7152 6.50001 20.5152 4.70001 18.5152C4.30001 18.0152 4.39999 17.3152 4.89999 17.0152L7.39999 15.6152C8.49999 16.9152 10.2 17.8152 12 17.8152C13.8 17.8152 15.5 17.0152 16.6 15.6152L19.1 17.0152ZM6.39999 13.9151C6.19999 13.2151 6 12.5152 6 11.8152C6 8.81517 8.2 6.41515 11 5.91515V3.01519C11 2.41519 10.4 1.91519 9.79999 2.01519C5.29999 3.01519 2 7.01517 2 11.8152C2 12.8152 2.2 13.8152 2.5 14.8152C2.7 15.4152 3.4 15.7152 4 15.3152L6.39999 13.9151Z" fill="black" />
+												</svg>
+											</span>
+                                            <!--end::Svg Icon-->
+										</span>
+										<span class="menu-title">Flagged Interest</span>
+									</span>
+                                    </div></a>
+                                    <?php
+                                } else {
+                                    ?>
+                                    <a href="/jobs/jobagree">
+                                    <div  class="menu-item">
+									<span class="menu-link">
+										<span class="menu-icon">
+											<!--begin::Svg Icon | path: icons/duotune/ecommerce/ecm001.svg-->
+											<span class="svg-icon svg-icon-2">
+												<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+													<path opacity="0.3" d="M18.041 22.041C18.5932 22.041 19.041 21.5932 19.041 21.041C19.041 20.4887 18.5932 20.041 18.041 20.041C17.4887 20.041 17.041 20.4887 17.041 21.041C17.041 21.5932 17.4887 22.041 18.041 22.041Z" fill="black" />
+													<path opacity="0.3" d="M6.04095 22.041C6.59324 22.041 7.04095 21.5932 7.04095 21.041C7.04095 20.4887 6.59324 20.041 6.04095 20.041C5.48867 20.041 5.04095 20.4887 5.04095 21.041C5.04095 21.5932 5.48867 22.041 6.04095 22.041Z" fill="black" />
+													<path opacity="0.3" d="M7.04095 16.041L19.1409 15.1409C19.7409 15.1409 20.141 14.7409 20.341 14.1409L21.7409 8.34094C21.9409 7.64094 21.4409 7.04095 20.7409 7.04095H5.44095L7.04095 16.041Z" fill="black" />
+													<path d="M19.041 20.041H5.04096C4.74096 20.041 4.34095 19.841 4.14095 19.541C3.94095 19.241 3.94095 18.841 4.14095 18.541L6.04096 14.841L4.14095 4.64095L2.54096 3.84096C2.04096 3.64096 1.84095 3.04097 2.14095 2.54097C2.34095 2.04097 2.94096 1.84095 3.44096 2.14095L5.44096 3.14095C5.74096 3.24095 5.94096 3.54096 5.94096 3.84096L7.94096 14.841C7.94096 15.041 7.94095 15.241 7.84095 15.441L6.54096 18.041H19.041C19.641 18.041 20.041 18.441 20.041 19.041C20.041 19.641 19.641 20.041 19.041 20.041Z" fill="black" />
+												</svg>
+											</span>
+                                            <!--end::Svg Icon-->
+										</span>
+										<span class="menu-title">Post/Create Job</span>
+									</span>
+                                    </div>
+                                    </a>
+
+                                    <?php
+                                }
+                                ?>
+
+								<div class="menu-item">
+									<div class="menu-content">
+										<div class="separator mx-1 my-4"></div>
+									</div>
+								</div>
+								<div class="menu-item">
+									<a class="menu-link" href="/res/media">
+										<span class="menu-icon">
+											<!--begin::Svg Icon | path: icons/duotune/coding/cod003.svg-->
+											<span class="svg-icon svg-icon-2">
+												<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+													<path d="M16.95 18.9688C16.75 18.9688 16.55 18.8688 16.35 18.7688C15.85 18.4688 15.75 17.8688 16.05 17.3688L19.65 11.9688L16.05 6.56876C15.75 6.06876 15.85 5.46873 16.35 5.16873C16.85 4.86873 17.45 4.96878 17.75 5.46878L21.75 11.4688C21.95 11.7688 21.95 12.2688 21.75 12.5688L17.75 18.5688C17.55 18.7688 17.25 18.9688 16.95 18.9688ZM7.55001 18.7688C8.05001 18.4688 8.15 17.8688 7.85 17.3688L4.25001 11.9688L7.85 6.56876C8.15 6.06876 8.05001 5.46873 7.55001 5.16873C7.05001 4.86873 6.45 4.96878 6.15 5.46878L2.15 11.4688C1.95 11.7688 1.95 12.2688 2.15 12.5688L6.15 18.5688C6.35 18.8688 6.65 18.9688 6.95 18.9688C7.15 18.9688 7.35001 18.8688 7.55001 18.7688Z" fill="black" />
+													<path opacity="0.3" d="M10.45 18.9687C10.35 18.9687 10.25 18.9687 10.25 18.9687C9.75 18.8687 9.35 18.2688 9.55 17.7688L12.55 5.76878C12.65 5.26878 13.25 4.8687 13.75 5.0687C14.25 5.1687 14.65 5.76878 14.45 6.26878L11.45 18.2688C11.35 18.6688 10.85 18.9687 10.45 18.9687Z" fill="black" />
+												</svg>
+											</span>
+											<!--end::Svg Icon-->
+										</span>
+										<span class="menu-title">Skill Videos</span>
+									</a>
+
+									<a class="menu-link" href="/res/prints">
+										<span class="menu-icon">
+											<!--begin::Svg Icon | path: icons/duotune/coding/cod003.svg-->
+											<span class="svg-icon svg-icon-2">
+												<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+													<path d="M16.95 18.9688C16.75 18.9688 16.55 18.8688 16.35 18.7688C15.85 18.4688 15.75 17.8688 16.05 17.3688L19.65 11.9688L16.05 6.56876C15.75 6.06876 15.85 5.46873 16.35 5.16873C16.85 4.86873 17.45 4.96878 17.75 5.46878L21.75 11.4688C21.95 11.7688 21.95 12.2688 21.75 12.5688L17.75 18.5688C17.55 18.7688 17.25 18.9688 16.95 18.9688ZM7.55001 18.7688C8.05001 18.4688 8.15 17.8688 7.85 17.3688L4.25001 11.9688L7.85 6.56876C8.15 6.06876 8.05001 5.46873 7.55001 5.16873C7.05001 4.86873 6.45 4.96878 6.15 5.46878L2.15 11.4688C1.95 11.7688 1.95 12.2688 2.15 12.5688L6.15 18.5688C6.35 18.8688 6.65 18.9688 6.95 18.9688C7.15 18.9688 7.35001 18.8688 7.55001 18.7688Z" fill="black" />
+													<path opacity="0.3" d="M10.45 18.9687C10.35 18.9687 10.25 18.9687 10.25 18.9687C9.75 18.8687 9.35 18.2688 9.55 17.7688L12.55 5.76878C12.65 5.26878 13.25 4.8687 13.75 5.0687C14.25 5.1687 14.65 5.76878 14.45 6.26878L11.45 18.2688C11.35 18.6688 10.85 18.9687 10.45 18.9687Z" fill="black" />
+												</svg>
+											</span>
+											<!--end::Svg Icon-->
+										</span>
+										<span class="menu-title">Library</span>
+									</a>
+
+								</div>
+							</div>
+							<!--end::Menu-->
+						</div>
+						<!--end::Aside Menu-->
+					</div>
+					<!--end::Aside menu-->
+					<!--begin::Footer-->
+					<div class="aside-footer flex-column-auto py-5" id="kt_aside_footer">
+						<a href="/logout" class="btn btn-custom btn-primary w-100" data-bs-toggle="tooltip" data-bs-trigger="hover" data-bs-dismiss-="click" title="200+ in-house components and 3rd-party plugins">
+							<span class="btn-label ">Logout</span>
+							<!--begin::Svg Icon | path: icons/duotune/general/gen005.svg-->
+							<span class="svg-icon btn-icon svg-icon-2">
+								<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+									<path opacity="0.3" d="M19 22H5C4.4 22 4 21.6 4 21V3C4 2.4 4.4 2 5 2H14L20 8V21C20 21.6 19.6 22 19 22ZM12.5 18C12.5 17.4 12.6 17.5 12 17.5H8.5C7.9 17.5 8 17.4 8 18C8 18.6 7.9 18.5 8.5 18.5L12 18C12.6 18 12.5 18.6 12.5 18ZM16.5 13C16.5 12.4 16.6 12.5 16 12.5H8.5C7.9 12.5 8 12.4 8 13C8 13.6 7.9 13.5 8.5 13.5H15.5C16.1 13.5 16.5 13.6 16.5 13ZM12.5 8C12.5 7.4 12.6 7.5 12 7.5H8C7.4 7.5 7.5 7.4 7.5 8C7.5 8.6 7.4 8.5 8 8.5H12C12.6 8.5 12.5 8.6 12.5 8Z" fill="black" />
+									<rect x="7" y="17" width="6" height="2" rx="1" fill="black" />
+									<rect x="7" y="12" width="10" height="2" rx="1" fill="black" />
+									<rect x="7" y="7" width="6" height="2" rx="1" fill="black" />
+									<path d="M15 8H20L14 2V7C14 7.6 14.4 8 15 8Z" fill="black" />
+								</svg>
+							</span>
+							<!--end::Svg Icon-->
+						</a>
+					</div>
+					<!--end::Footer-->
+				</div>
+				<!--end::Aside-->
+				<!--begin::Wrapper-->
+				<div class="wrapper d-flex flex-column flex-row-fluid" id="kt_wrapper">
+					<!--begin::Header-->
+					<div id="kt_header" style="" class="header align-items-stretch">
+						<!--begin::Brand-->
+						<div class="header-brand">
+							<!--begin::Logo-->
+							<a href="#">
+								<img alt="Logo" src="/assets/ext/images/wrenchboard.png" class="h-25px h-lg-45px" />
+							</a>
+							<!--end::Logo-->
+							<!--begin::Aside minimize-->
+							<div id="kt_aside_toggle" class="btn btn-icon w-auto px-0 btn-active-color-primary aside-minimize" data-kt-toggle="true" data-kt-toggle-state="active" data-kt-toggle-target="body" data-kt-toggle-name="aside-minimize">
+								<!--begin::Svg Icon | path: icons/duotune/arrows/arr092.svg-->
+								<span class="svg-icon svg-icon-1 me-n1 minimize-default">
+									<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+										<rect opacity="0.3" x="8.5" y="11" width="12" height="2" rx="1" fill="black" />
+										<path d="M10.3687 11.6927L12.1244 10.2297C12.5946 9.83785 12.6268 9.12683 12.194 8.69401C11.8043 8.3043 11.1784 8.28591 10.7664 8.65206L7.84084 11.2526C7.39332 11.6504 7.39332 12.3496 7.84084 12.7474L10.7664 15.3479C11.1784 15.7141 11.8043 15.6957 12.194 15.306C12.6268 14.8732 12.5946 14.1621 12.1244 13.7703L10.3687 12.3073C10.1768 12.1474 10.1768 11.8526 10.3687 11.6927Z" fill="black" />
+										<path opacity="0.5" d="M16 5V6C16 6.55228 15.5523 7 15 7C14.4477 7 14 6.55228 14 6C14 5.44772 13.5523 5 13 5H6C5.44771 5 5 5.44772 5 6V18C5 18.5523 5.44771 19 6 19H13C13.5523 19 14 18.5523 14 18C14 17.4477 14.4477 17 15 17C15.5523 17 16 17.4477 16 18V19C16 20.1046 15.1046 21 14 21H5C3.89543 21 3 20.1046 3 19V5C3 3.89543 3.89543 3 5 3H14C15.1046 3 16 3.89543 16 5Z" fill="black" />
+									</svg>
+								</span>
+								<!--end::Svg Icon-->
+								<!--begin::Svg Icon | path: icons/duotune/arrows/arr076.svg-->
+								<span class="svg-icon svg-icon-1 minimize-active">
+									<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+										<rect opacity="0.3" width="12" height="2" rx="1" transform="matrix(-1 0 0 1 15.5 11)" fill="black" />
+										<path d="M13.6313 11.6927L11.8756 10.2297C11.4054 9.83785 11.3732 9.12683 11.806 8.69401C12.1957 8.3043 12.8216 8.28591 13.2336 8.65206L16.1592 11.2526C16.6067 11.6504 16.6067 12.3496 16.1592 12.7474L13.2336 15.3479C12.8216 15.7141 12.1957 15.6957 11.806 15.306C11.3732 14.8732 11.4054 14.1621 11.8756 13.7703L13.6313 12.3073C13.8232 12.1474 13.8232 11.8526 13.6313 11.6927Z" fill="black" />
+										<path d="M8 5V6C8 6.55228 8.44772 7 9 7C9.55228 7 10 6.55228 10 6C10 5.44772 10.4477 5 11 5H18C18.5523 5 19 5.44772 19 6V18C19 18.5523 18.5523 19 18 19H11C10.4477 19 10 18.5523 10 18C10 17.4477 9.55228 17 9 17C8.44772 17 8 17.4477 8 18V19C8 20.1046 8.89543 21 10 21H19C20.1046 21 21 20.1046 21 19V5C21 3.89543 20.1046 3 19 3H10C8.89543 3 8 3.89543 8 5Z" fill="#C4C4C4" />
+									</svg>
+								</span>
+								<!--end::Svg Icon-->
+							</div>
+							<!--end::Aside minimize-->
+							<!--begin::Aside toggle-->
+							<div class="d-flex align-items-center d-lg-none ms-n3 me-1" title="Show aside menu">
+								<div class="btn btn-icon btn-active-color-primary w-30px h-30px" id="kt_aside_mobile_toggle">
+									<!--begin::Svg Icon | path: icons/duotune/abstract/abs015.svg-->
+									<span class="svg-icon svg-icon-1">
+										<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+											<path d="M21 7H3C2.4 7 2 6.6 2 6V4C2 3.4 2.4 3 3 3H21C21.6 3 22 3.4 22 4V6C22 6.6 21.6 7 21 7Z" fill="black" />
+											<path opacity="0.3" d="M21 14H3C2.4 14 2 13.6 2 13V11C2 10.4 2.4 10 3 10H21C21.6 10 22 10.4 22 11V13C22 13.6 21.6 14 21 14ZM22 20V18C22 17.4 21.6 17 21 17H3C2.4 17 2 17.4 2 18V20C2 20.6 2.4 21 3 21H21C21.6 21 22 20.6 22 20Z" fill="black" />
+										</svg>
+									</span>
+									<!--end::Svg Icon-->
+								</div>
+							</div>
+							<!--end::Aside toggle-->
+						</div>
+						<!--end::Brand-->
+						<!--begin::Toolbar-->
+						<div class="toolbar d-flex align-items-stretch">
+							<!--begin::Toolbar container-->
+							<div class="container-fluid py-6 py-lg-0 d-flex flex-column flex-lg-row align-items-lg-stretch justify-content-lg-between">
+								<!--begin::Page title-->
+								<div class="page-title d-flex justify-content-center flex-column me-5">
+									<!--begin::Title-->
+									<h1 class="d-flex flex-column text-dark fw-bolder fs-3 mb-0"><? echo isset($page_title) ? $page_title : 'Home'; ?></h1>
+									<!--end::Title-->
+									<!--begin::Breadcrumb-->
+									<ul class="breadcrumb breadcrumb-separatorless fw-bold fs-7 pt-1">
+										<!--begin::Item-->
+										<li class="breadcrumb-item text-muted">
+											<a href="/dash" class="text-muted text-hover-primary">Home</a>
+										</li>
+										<!--end::Item-->
+										<!--begin::Item-->
+										<li class="breadcrumb-item">
+											<span class="bullet bg-gray-200 w-5px h-2px"></span>
+										</li>
+										<!--end::Item-->
+										<!--begin::Item-->
+										<li class="breadcrumb-item text-muted"><? echo isset($page_title) ? $page_title : ''; ?></li>
+										<!--end::Item-->
+										<!--begin::Item-->
+										<li class="breadcrumb-item">
+											<span class="bullet bg-gray-200 w-5px h-2px"></span>
+										</li>
+										<!--end::Item-->
+
+									</ul>
+									<!--end::Breadcrumb-->
+								</div>
+								<!--end::Page title-->
+								<!--begin::Action group-->
+								<div class="d-flex align-items-stretch overflow-auto pt-3 pt-lg-0">
+
+
+									<!--begin::Action wrapper-->
+									<div class="d-flex align-items-center">
+
+										<!--begin::Actions-->
+										<div class="d-flex">
+                                            <!--begin::Action-->
+                                            <a href="/member/balance" class="btn btn-sm  btn-active-icon-primary" >
+                                                <!--begin::Svg Icon | path: icons/duotune/files/fil003.svg-->
+                                                <span class="fs-7 text-gray-700 fw-bolder pe-3 d-none d-xxl-block">My Wallet</span>
+                                                <!--end::Svg Icon-->
+                                            </a>
+                                            <!--end::Action-->
+
+											<!--begin::Action-->
+											<a href="/proj/mycomplete" class="btn btn-sm  btn-active-icon-primary" >
+												<!--begin::Svg Icon | path: icons/duotune/files/fil003.svg-->
+												<span class="fs-7 text-gray-700 fw-bolder pe-3 d-none d-xxl-block">Previous Tasks</span>
+												<!--end::Svg Icon-->
+											</a>
+											<!--end::Action-->
+
+                                            <!--begin::Action-->
+                                            <a href="/refer/refagree" class="btn btn-sm  btn-active-icon-primary" >
+                                                <!--begin::Svg Icon | path: icons/duotune/files/fil003.svg-->
+                                                <span class="fs-7 text-gray-700 fw-bolder pe-3 d-none d-xxl-block">Refer a Friend</span>
+                                                <!--end::Svg Icon-->
+                                            </a>
+                                            <!--end::Action-->
+
+
+                                            <!--begin::Action-->
+                                            <a href="/member/yourpage" class="btn btn-sm  btn-active-icon-primary" >
+                                                <!--begin::Svg Icon | path: icons/duotune/files/fil003.svg-->
+                                                <span class="fs-7 text-gray-700 fw-bolder pe-3 d-none d-xxl-block">My Page</span>
+                                                <!--end::Svg Icon-->
+                                            </a>
+                                            <!--end::Action-->
+										</div>
+										<!--end::Actions-->
+									</div>
+									<!--end::Action wrapper-->
+
+								</div>
+								<!--end::Action group-->
+							</div>
+							<!--end::Toolbar container-->
+						</div>
+						<!--end::Toolbar-->
+					</div>
+					<!--end::Header-->
+					<!--begin::Content-->
+					<div class="content d-flex flex-column flex-column-fluid" id="kt_content">
+						<!--begin::Post-->
+						<div class="post d-flex flex-column-fluid" id="kt_post">
+							<!--begin::Container-->
+							<div id="kt_content_container" class="container-xxl">

www/application/views/users/common/userstrip.php

@@ -7,13 +7,54 @@ if ($_SESSION["offer_interest_count"]  + $_SESSION['past_duejobs_count'] > 0) {
 
     if ($_SESSION['past_duejobs_count'] > 0) {
         ?>
-        <div class="panel bg-slate" style="background-color: lightpink;"> <div class="panel-body">   <div class="row"> <a href="/proj/pastdue"> <h5 class="no-margin"> You have <?= $_SESSION['past_duejobs_count'] ?> task(s) that are passed due dates Click here to manage</h5></a> </div> </div> </div>
+        <!--begin::Row-->
+        <div class="row g-5 g-xl-8">
+            <!--begin::Col-->
+            <div class="col-xl-12">
+                <!--begin::Tables Widget 5-->
+                <div class="card card-xl-stretch mb-5 mb-xl-8" style="backdrop-color:lightred;">
+                    <!--begin::Header-->
+                    <div class="card-header border-0 pt-5">
+                        <h3 class="card-title align-items-start flex-column">
+                            <span class="card-label fw-bolder fs-3 mb-1">
+                                <a href="/proj/pastdue"> <h5 class="no-margin"> You have <?= $_SESSION['past_duejobs_count'] ?> task(s) that are passed due dates Click here to manage</h5></a>
+                            </span>
+                        </h3>
+                    </div>
+
+                </div>
+                <!--end::Tables Widget 5-->
+            </div>
+            <!--end::Col-->
+        </div>
+        <!--end::Row-->
+
         <?
     }
 
     if ($_SESSION["offer_interest_count"]  > 0) {
         ?>
-        <div class="panel bg-slate"> <div class="panel-body">   <div class="row"> <a href="/jobs/offerinterest"> <h5 class="no-margin">You have <?= $_SESSION["offer_interest_count"]  ?> interest in your task.Click to view now</h5></a> </div> </div> </div>
+        <!--begin::Row-->
+        <div class="row g-5 g-xl-8">
+            <!--begin::Col-->
+            <div class="col-xl-12">
+                <!--begin::Tables Widget 5-->
+                <div class="card card-xl-stretch mb-5 mb-xl-8"  style="backdrop-color:lightred;">
+                    <!--begin::Header-->
+                    <div class="card-header border-0 pt-5">
+                        <h3 class="card-title align-items-start flex-column">
+                            <span class="card-label fw-bolder fs-3 mb-1">
+                                <a href="/jobs/offerinterest"> <h5 class="no-margin">You have <?= $_SESSION["offer_interest_count"]  ?> interest in your task.Click to view now</h5></a>
+                            </span>
+                        </h3>
+                    </div>
+
+                </div>
+                <!--end::Tables Widget 5-->
+            </div>
+            <!--end::Col-->
+        </div>
+        <!--end::Row-->
         <?
     }
 } else {

www/application/views/users/view_balance.php

@@ -1,117 +1,458 @@
-<!-- Main content -->
-<div class="content-wrapper">
 
-    <?php include('common/userstrip.php'); ?>
+<?php include('common/userstrip.php'); ?>
 
-    
-    <!-- Marketing campaigns -->
-    <div class="panel panel-flat">
-        <div class="row">
-            <div class="col-lg-4">
-                <span class="label label-flat border-primary text-primary-600">   <h5 class="no-margin">Account Balance : <? echo money_format('%.2n', $current_balance * 0.01); ?></h5></span>
-            </div>
-            <div class="col-lg-4">
-                <span class="label label-flat border-primary text-primary-600">   <h5 class="no-margin ">Escrow Balance :<? echo money_format('%.2n', $escrow_balance * 0.01); ?> </h5> </span>
-            </div> 
 
-            <div class="col-lg-4">
+<!--begin::Row-->
-                <form class="form-horizontal" action="/member/addfund" method='POST'>
+<div class="row g-5 g-xl-8">
-                <button type="submit" onclick="addfund();" class="btn btn-primary btn-xs btn-block">Add Fund</button>
+    <!--begin::Col-->
-                </form>
+    <div class="col-xl-6">
-            </div> 
+        <!--begin::Table Widget 7-->
-        </div>
+        <div class="card card-xl-stretch mb-xl-8">
-    </div>
+            <!--begin::Header-->
-    <!-- /marketing campaigns -->
+            <div class="card-header border-0 pt-5">
-
+                <h3 class="card-title align-items-start flex-column">
-    <!-- Marketing campaigns -->
+                    <span class="card-label fw-bolder fs-3 mb-1">Wallet</span>
-    <div class="panel panel-flat">
+                    <span class="text-muted mt-1 fw-bold fs-7">More than 100 new orders</span>
-        <div class="panel-heading">
+                </h3>
-            <h5 class="panel-title">Withdraw from Balance [<? echo money_format('%.2n', $current_balance * 0.01); ?>]</h5>
+                <div class="card-toolbar">
-            <form class="form-horizontal" action="/member/balance" method='POST'>
+                    <ul class="nav">
-                <div class="row">
+                        Add New Wallet
-                    <div class="col-md-10 col-md-offset-1">
+                    </ul>
-                        
-
-                    </div>
                 </div>
+            </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body py-3">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_7_tab_1">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr>
+                                    <th class="p-0 min-w-50px">Currency</th>
+                                    <th class="p-0 min-w-240px">Balance</th>
+                                    <th class="p-0 min-w-120px">Escrow</th>
+                                    <th class="p-0 min-w-50px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <tr>
 
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Naira</a>
+                                        <span class="text-muted fw-bold d-block fs-7">#</span>
+                                    </td>
+                                    <td class="text-start">
+                                        <span class="badge badge-light-success fs-7 fw-bolder"><? echo money_format('%.2n', $current_balance * 0.01); ?></span>
+                                    </td>
+                                    <td class="text-start">
+                                        <span class="badge badge-light-danger fs-7 fw-bolder"><? echo money_format('%.2n', $escrow_balance * 0.01); ?></span>
+                                    </td>
+                                    <td class="text-end">
 
-                <script type="text/javascript">
+                                        <div class="d-flex justify-content-end flex-shrink-0">
-                    <!--
+                                            <a href="/member/smoney" class="btn btn-icon btn-bg-light btn-active-color-primary btn-sm me-1">
-                    function getFee(val) {
+                                                <!--begin::Svg Icon | path: icons/duotune/general/gen019.svg-->
-                        $.ajax({
+                                                <span class="svg-icon svg-icon-3">
-                            url: "/member/fee?amount=" + val
+																		<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-                        }).done(function (data) {
+																			<path d="M17.5 11H6.5C4 11 2 9 2 6.5C2 4 4 2 6.5 2H17.5C20 2 22 4 22 6.5C22 9 20 11 17.5 11ZM15 6.5C15 7.9 16.1 9 17.5 9C18.9 9 20 7.9 20 6.5C20 5.1 18.9 4 17.5 4C16.1 4 15 5.1 15 6.5Z" fill="black" />
-                            var fee = 0;
+																			<path opacity="0.3" d="M17.5 22H6.5C4 22 2 20 2 17.5C2 15 4 13 6.5 13H17.5C20 13 22 15 22 17.5C22 20 20 22 17.5 22ZM4 17.5C4 18.9 5.1 20 6.5 20C7.9 20 9 18.9 9 17.5C9 16.1 7.9 15 6.5 15C5.1 15 4 16.1 4 17.5Z" fill="black" />
-                            if (parseFloat(data) > 0) {
+																		</svg>
-                                fee = parseFloat(data);
+																	</span>
-                            }
+                                                <!--end::Svg Icon-->
-                            var total = fee + parseFloat(val);
+                                            </a>
-                            $('#fee').val(fee.toFixed(2));
+                                            <a href="/member/addfund" class="btn btn-icon btn-bg-light btn-active-color-primary btn-sm me-1">
-                            $('#total').val(total.toFixed(2));
+                                                <!--begin::Svg Icon | path: icons/duotune/art/art005.svg-->
-                        });
+                                                <span class="svg-icon svg-icon-3">
-                    }
+																		<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-                    // -->
+																			<path opacity="0.3" d="M21.4 8.35303L19.241 10.511L13.485 4.755L15.643 2.59595C16.0248 2.21423 16.5426 1.99988 17.0825 1.99988C17.6224 1.99988 18.1402 2.21423 18.522 2.59595L21.4 5.474C21.7817 5.85581 21.9962 6.37355 21.9962 6.91345C21.9962 7.45335 21.7817 7.97122 21.4 8.35303ZM3.68699 21.932L9.88699 19.865L4.13099 14.109L2.06399 20.309C1.98815 20.5354 1.97703 20.7787 2.03189 21.0111C2.08674 21.2436 2.2054 21.4561 2.37449 21.6248C2.54359 21.7934 2.75641 21.9115 2.989 21.9658C3.22158 22.0201 3.4647 22.0084 3.69099 21.932H3.68699Z" fill="black" />
-                </script>
+																			<path d="M5.574 21.3L3.692 21.928C3.46591 22.0032 3.22334 22.0141 2.99144 21.9594C2.75954 21.9046 2.54744 21.7864 2.3789 21.6179C2.21036 21.4495 2.09202 21.2375 2.03711 21.0056C1.9822 20.7737 1.99289 20.5312 2.06799 20.3051L2.696 18.422L5.574 21.3ZM4.13499 14.105L9.891 19.861L19.245 10.507L13.489 4.75098L4.13499 14.105Z" fill="black" />
-                <div class="panel-body">
+																		</svg>
-                    <div class="row">
+																	</span>
+                                                <!--end::Svg Icon-->
+                                            </a>
+                                        </div>
+                                    </td>
+                                </tr>
+                                <tr>
 
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">US Dollars</a>
+                                        <span class="text-muted fw-bold d-block fs-7">$</span>
+                                    </td>
+                                    <td class="text-start">
+                                        <span class="badge badge-light-success fs-7 fw-bolder"><? echo money_format('%.2n', 0 * 0.01); ?></span>
+                                    </td>
+                                    <td class="text-start">
+                                        <span class="badge badge-light-danger fs-7 fw-bolder"><? echo money_format('%.2n', 0 * 0.01); ?></span>
+                                    </td>
+                                    <td class="text-end">
+                                        <button type="submit" class="btn btn-sm btn-secondary btn-xs btn-block">Add Fund</button>
+                                    </td>
+                                </tr>
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
                     </div>
-                    <div class="col-md-10 col-md-offset-1">
+                    <!--end::Tap pane-->
-                        <div class="form-group">
+                </div>
-                            <label class="col-lg-3 control-label"> Amount:</label>
+            </div>
-                            <div class="col-lg-9">
+            <!--end::Body-->
-                                <input name ="amount" type="text" class="form-control" placeholder="Amount to withdraw" value="<?php echo $amount; ?>" onKeyUp="this.value = this.value.replace(/[^0-9]/g, '');getFee(this.value);" maxlength='6' onChange="getFee(this.value)">
-                            </div>
-                        </div>
-
-                        <div class="form-group">
-                            <label class="col-lg-3 control-label">Recipient Acc:[<a href ='/member/recipient' class="label label-info">Add New</a>]</label>
-                            <div class="col-lg-9">
-                                <?php echo $recipient_account_combo; ?>
-                            </div>
-                        </div>
-
-                        <div class="form-group">
-                            <label class="col-lg-3 control-label">Processing Fee:</label>
-                            <div class="col-lg-9">
-                                <input name ="fee" id="fee" type="text" class="form-control" placeholder="Processing fee" value="<?php echo $fee * 0.01; ?>" readonly >
-                            </div>
-                        </div>
-
-
-                        <div class="form-group">
-                            <label class="col-lg-3 control-label"> Total :</label>
-                            <div class="col-lg-9">
-                                <input name ="total" id="total" type="text" class="form-control" placeholder="Total" value="<?php echo $total * 0.01; ?>" readonly >
-                            </div>
-                        </div>
-
-                        <div class="form-group">
-                            <label class="col-lg-3 control-label"> Comment/Note :</label>
-                            <div class="col-lg-9">
-                                <input name="comment" type="text" class="form-control" placeholder="Comment" value="<?php echo $comment; ?>">
-                            </div>
-                        </div>
-
-                        <div class="text-right">
-                            <?php echo $add_error; ?>
-                            <button type="submit" class="btn btn-primary btn-xs">Continue <i class="icon-arrow-right14 position-right"></i></button>
-                        </div>
-
-                    </div>
-                </div>           
-
-            </form>
         </div>
+        <!--end::Tables Widget 7-->
     </div>
-    <!-- /marketing campaigns -->
+    <!--end::Col-->
-    <div class="panel panel-flat">
+    <!--begin::Col-->
-        <div class="panel-heading">
+    <div class="col-xl-6">
-            <?php echo $sendmoney_table; ?>  
+        <!--begin::Table Widget 8-->
-        </div>  
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
-    </div>
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Recent Activities</span>
+                    <span class="text-muted mt-1 fw-bold fs-7">Activity Report</span>
+                </h3>
+                <div class="card-toolbar">
 
+                </div>
+            </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body py-3">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_8_tab_1">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+
+                                <tr>
+                                    <th class="p-0 w-90px">Date</th>
+                                    <th class="p-0 min-w-150px">Recipient</th>
+                                    <th class="p-0 w-60px">Amount/Fee</th>
+                                    <th class="p-0 min-w-100px">Conf/Status</th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <?php
+                                //var_dump($sendmoney_table_result);
+                                foreach( $sendmoney_table_result as $row){
+                                    ?>
+                                    <tr>
+                                        <td>
+                                            <?=$row->date?>
+                                        </td>
+                                        <td>
+                                            <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6"><?=$row->recitient?></a>
+                                            <span class="text-muted fw-bold d-block fs-7"></span>
+                                        </td>
+                                        <td>
+                                            <?=$row->amount?><br><?=$row->fee?>
+                                        </td>
+                                        <td class="text-end">
+                                            <span class="text-dark fw-bolder d-block fs-7"><?=$row->confirmation?></span>
+                                            <span class="text-muted fw-bold d-block fs-8"><?=$row->status?></span>
+                                        </td>
+                                        <td class="text-end">
+                                            <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                                <i class="bi bi-three-dots fs-5"></i>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                    <?php
+                                }
+                                ?>
+
+
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+
+
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade" id="kt_table_widget_8_tab_2">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr>
+                                    <th class="p-0 w-50px"></th>
+                                    <th class="p-0 min-w-150px"></th>
+                                    <th class="p-0 min-w-120px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-info">
+																					<!--begin::Svg Icon | path: icons/duotune/maps/map004.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-info">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18.4 5.59998C21.9 9.09998 21.9 14.8 18.4 18.3C14.9 21.8 9.2 21.8 5.7 18.3L18.4 5.59998Z" fill="black" />
+																							<path d="M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12C22 6.5 17.5 2 12 2ZM19.9 11H13V8.8999C14.9 8.6999 16.7 8.00005 18.1 6.80005C19.1 8.00005 19.7 9.4 19.9 11ZM11 19.8999C9.7 19.6999 8.39999 19.2 7.39999 18.5C8.49999 17.7 9.7 17.2001 11 17.1001V19.8999ZM5.89999 6.90002C7.39999 8.10002 9.2 8.8 11 9V11.1001H4.10001C4.30001 9.4001 4.89999 8.00002 5.89999 6.90002ZM7.39999 5.5C8.49999 4.7 9.7 4.19998 11 4.09998V7C9.7 6.8 8.39999 6.3 7.39999 5.5ZM13 17.1001C14.3 17.3001 15.6 17.8 16.6 18.5C15.5 19.3 14.3 19.7999 13 19.8999V17.1001ZM13 4.09998C14.3 4.29998 15.6 4.8 16.6 5.5C15.5 6.3 14.3 6.80002 13 6.90002V4.09998ZM4.10001 13H11V15.1001C9.1 15.3001 7.29999 16 5.89999 17.2C4.89999 16 4.30001 14.6 4.10001 13ZM18.1 17.1001C16.6 15.9001 14.8 15.2 13 15V12.8999H19.9C19.7 14.5999 19.1 16.0001 18.1 17.1001Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Who Knows Geography</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Zoey Dylan</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">3:22PM, 07 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-warning">
+																					<!--begin::Svg Icon | path: icons/duotune/general/gen025.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-warning">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<rect x="2" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="13" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="2" y="13" width="9" height="9" rx="2" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Maths Championship</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Tom Gere</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">10:05PM, 25 Oct</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-danger">
+																					<!--begin::Svg Icon | path: icons/duotune/coding/cod002.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-danger">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18 22C19.7 22 21 20.7 21 19C21 18.5 20.9 18.1 20.7 17.7L15.3 6.30005C15.1 5.90005 15 5.5 15 5C15 3.3 16.3 2 18 2H6C4.3 2 3 3.3 3 5C3 5.5 3.1 5.90005 3.3 6.30005L8.7 17.7C8.9 18.1 9 18.5 9 19C9 20.7 7.7 22 6 22H18Z" fill="black" />
+																							<path d="M18 2C19.7 2 21 3.3 21 5H9C9 3.3 7.7 2 6 2H18Z" fill="black" />
+																							<path d="M9 19C9 20.7 7.7 22 6 22C4.3 22 3 20.7 3 19H9Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">School Music Festival</a>
+                                        <span class="text-muted fw-bold d-block fs-7">by Rose Liam</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">4:20PM, 03 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade" id="kt_table_widget_8_tab_3">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr>
+                                    <th class="p-0 w-50px"></th>
+                                    <th class="p-0 min-w-150px"></th>
+                                    <th class="p-0 min-w-120px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-warning">
+																					<!--begin::Svg Icon | path: icons/duotune/general/gen025.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-warning">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<rect x="2" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="13" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="2" y="13" width="9" height="9" rx="2" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Maths Championship</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Tom Gere</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">10:05PM, 25 Oct</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-info">
+																					<!--begin::Svg Icon | path: icons/duotune/maps/map004.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-info">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18.4 5.59998C21.9 9.09998 21.9 14.8 18.4 18.3C14.9 21.8 9.2 21.8 5.7 18.3L18.4 5.59998Z" fill="black" />
+																							<path d="M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12C22 6.5 17.5 2 12 2ZM19.9 11H13V8.8999C14.9 8.6999 16.7 8.00005 18.1 6.80005C19.1 8.00005 19.7 9.4 19.9 11ZM11 19.8999C9.7 19.6999 8.39999 19.2 7.39999 18.5C8.49999 17.7 9.7 17.2001 11 17.1001V19.8999ZM5.89999 6.90002C7.39999 8.10002 9.2 8.8 11 9V11.1001H4.10001C4.30001 9.4001 4.89999 8.00002 5.89999 6.90002ZM7.39999 5.5C8.49999 4.7 9.7 4.19998 11 4.09998V7C9.7 6.8 8.39999 6.3 7.39999 5.5ZM13 17.1001C14.3 17.3001 15.6 17.8 16.6 18.5C15.5 19.3 14.3 19.7999 13 19.8999V17.1001ZM13 4.09998C14.3 4.29998 15.6 4.8 16.6 5.5C15.5 6.3 14.3 6.80002 13 6.90002V4.09998ZM4.10001 13H11V15.1001C9.1 15.3001 7.29999 16 5.89999 17.2C4.89999 16 4.30001 14.6 4.10001 13ZM18.1 17.1001C16.6 15.9001 14.8 15.2 13 15V12.8999H19.9C19.7 14.5999 19.1 16.0001 18.1 17.1001Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Who Knows Geography</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Zoey Dylan</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">3:22PM, 07 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-primary">
+																					<!--begin::Svg Icon | path: icons/duotune/abstract/abs027.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-primary">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M21.25 18.525L13.05 21.825C12.35 22.125 11.65 22.125 10.95 21.825L2.75 18.525C1.75 18.125 1.75 16.725 2.75 16.325L4.04999 15.825L10.25 18.325C10.85 18.525 11.45 18.625 12.05 18.625C12.65 18.625 13.25 18.525 13.85 18.325L20.05 15.825L21.35 16.325C22.35 16.725 22.35 18.125 21.25 18.525ZM13.05 16.425L21.25 13.125C22.25 12.725 22.25 11.325 21.25 10.925L13.05 7.62502C12.35 7.32502 11.65 7.32502 10.95 7.62502L2.75 10.925C1.75 11.325 1.75 12.725 2.75 13.125L10.95 16.425C11.65 16.725 12.45 16.725 13.05 16.425Z" fill="black" />
+																							<path d="M11.05 11.025L2.84998 7.725C1.84998 7.325 1.84998 5.925 2.84998 5.525L11.05 2.225C11.75 1.925 12.45 1.925 13.15 2.225L21.35 5.525C22.35 5.925 22.35 7.325 21.35 7.725L13.05 11.025C12.45 11.325 11.65 11.325 11.05 11.025Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Napoleon Days</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Luke Owen</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">1:20PM, 02 Dec</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-danger">
+																					<!--begin::Svg Icon | path: icons/duotune/coding/cod002.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-danger">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18 22C19.7 22 21 20.7 21 19C21 18.5 20.9 18.1 20.7 17.7L15.3 6.30005C15.1 5.90005 15 5.5 15 5C15 3.3 16.3 2 18 2H6C4.3 2 3 3.3 3 5C3 5.5 3.1 5.90005 3.3 6.30005L8.7 17.7C8.9 18.1 9 18.5 9 19C9 20.7 7.7 22 6 22H18Z" fill="black" />
+																							<path d="M18 2C19.7 2 21 3.3 21 5H9C9 3.3 7.7 2 6 2H18Z" fill="black" />
+																							<path d="M9 19C9 20.7 7.7 22 6 22C4.3 22 3 20.7 3 19H9Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">School Music Festival</a>
+                                        <span class="text-muted fw-bold d-block fs-7">by Rose Liam</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">4:20PM, 03 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+                </div>
+            </div>
+            <!--end::Body-->
+        </div>
+        <!--end::Tables Widget 8-->
+    </div>
+    <!--end::Col-->
 </div>
+<!--end::Row-->
+
+
 
 

www/application/views/users/view_confirmwithdraw.php

@@ -1,92 +1,434 @@
-<!-- Main content -->
-<div class="content-wrapper">
 
-    <?php include('common/userstrip.php'); ?>
+<?php include('common/userstrip.php'); ?>
+
+<!--begin::Row-->
+<div class="row g-5 g-xl-8">
+    <!--begin::Col-->
+    <div class="col-xl-6">
+        <!--begin::Tables Widget 3-->
+        <div class="card card-xl-stretch mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Confirm Withdraw to Account</span>
+                    <span class="text-muted mt-1 fw-bold fs-7">Account Balance :<? echo money_format('%i', $current_balance * 0.01); ?> Naira</span>
+                </h3>
+                <div class="card-toolbar">
 
-    <!-- Marketing campaigns -->
-    <div class="panel panel-flat">
-        <div class="row">
-            <div class="col-lg-6">
-                <div class="panel-heading">
-                    <h4 class="no-margin">Account Balance :<? echo money_format('%i', $current_balance * 0.01); ?> Naira</h4>
                 </div>
             </div>
-            <div class="col-lg-6">
+            <!--end::Header-->
-                <div class="panel-heading">
+            <!--begin::Body-->
-                    <h5 class="no-margin">Escrow Balance :<? echo money_format('%i', $escrow_balance * 0.01); ?> Naira</h5>
+            <div class="card-body py-3">
-                </div> 
+                <!--begin::Table container-->
-            </div>
+                <form class="form-horizontal" action="/member/confirmwithdraw" method='POST'>
-        </div>
+                    <input type="hidden" name="recipientid" value="<?php echo $recipient_account; ?>">
-    </div>
+                    <div class="panel-heading">
-    <!-- /marketing campaigns -->
+                        <div class="row">
+                            <div class="col-md-10 col-md-offset-1">
+                                <h5 class="panel-title">Confirm Withdraw to Account</h5>
 
-    <!-- Marketing campaigns -->
+                            </div>
-    <div class="panel panel-flat">
+                        </div>
-        <div class="panel-heading">
+                    </div>
-            <form class="form-horizontal" action="/member/confirmwithdraw" method='POST'>
+
-                <input type="hidden" name="recipientid" value="<?php echo $recipient_account; ?>">
+                    <div class="panel-body">
-                <div class="panel-heading">
+                        <div class="row">
-                    <div class="row">
+
+                        </div>
                         <div class="col-md-10 col-md-offset-1">
-                            <h5 class="panel-title">Confirm Withdraw to Account</h5>
+                            <div class="form-group">
+                                <label class="col-lg-3 control-label"> Amount:</label>
+                                <div class="col-lg-9">
+                                    <input name ="amount" type="text" class="form-control" placeholder="Amount to withdraw" value="<?php echo $amount; ?>" readonly>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="col-lg-3 control-label">Recipient Acc:</label>
+                                <div class="col-lg-9">
+                                    <?php echo $recipient_account_combo; ?>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="col-lg-3 control-label">Processing Fee:</label>
+                                <div class="col-lg-9">
+                                    <input name ="fee" type="text" class="form-control" placeholder="Processing fee" value="<?php echo $fee*0.01; ?>" readonly >
+                                </div>
+                            </div>
+
+
+                            <div class="form-group">
+                                <label class="col-lg-3 control-label"> Total :</label>
+                                <div class="col-lg-9">
+                                    <input name ="total" type="text" class="form-control" placeholder="Total" value="<?php echo $total*0.01; ?>" readonly >
+                                </div>
+                            </div>
+
+
+                            <div class="form-group">
+                                <label class="col-lg-3 control-label"> Comment/Note :</label>
+                                <div class="col-lg-9">
+                                    <input name="comment" type="text" class="form-control" placeholder="Comment" value="<?php echo $comment; ?>" readonly >
+                                </div>
+                            </div>
+
+                            <div class="text-right">
+                                <button type="submit" class="btn btn-primary">Complete <i class="icon-arrow-right14 position-right"></i></button>
+                            </div>
 
                         </div>
                     </div>
-                </div>
 
-                <div class="panel-body">
+                </form>
-                    <div class="row">
+                <!--end::Table container-->
-
+            </div>
-                    </div>
+            <!--begin::Body-->
-                    <div class="col-md-10 col-md-offset-1">
-                        <div class="form-group">
-                            <label class="col-lg-3 control-label"> Amount:</label>
-                            <div class="col-lg-9">
-                                <input name ="amount" type="text" class="form-control" placeholder="Amount to withdraw" value="<?php echo $amount; ?>" readonly>
-                            </div>
-                        </div>
-
-                        <div class="form-group">
-                            <label class="col-lg-3 control-label">Recipient Acc:</label>
-                            <div class="col-lg-9">
-                                <?php echo $recipient_account_combo; ?>
-                            </div>
-                        </div>
-
-                         <div class="form-group">
-                            <label class="col-lg-3 control-label">Processing Fee:</label>
-                            <div class="col-lg-9">
-                                <input name ="fee" type="text" class="form-control" placeholder="Processing fee" value="<?php echo $fee*0.01; ?>" readonly >
-                            </div>
-                        </div>
-
-
-                        <div class="form-group">
-                            <label class="col-lg-3 control-label"> Total :</label>
-                            <div class="col-lg-9">
-                                <input name ="total" type="text" class="form-control" placeholder="Total" value="<?php echo $total*0.01; ?>" readonly >
-                            </div>
-                        </div>
-
-
-                        <div class="form-group">
-                            <label class="col-lg-3 control-label"> Comment/Note :</label>
-                            <div class="col-lg-9">
-                                <input name="comment" type="text" class="form-control" placeholder="Comment" value="<?php echo $comment; ?>" readonly >
-                            </div>
-                        </div>
-
-                        <div class="text-right">
-                            <button type="submit" class="btn btn-primary">Complete <i class="icon-arrow-right14 position-right"></i></button>
-                        </div>
-
-                    </div>
-                </div>           
-
-            </form>
         </div>
+        <!--end::Tables Widget 3-->
     </div>
-    <!-- /marketing campaigns -->
+    <!--end::Col-->
+    <!--begin::Col-->
+    <div class="col-xl-6">
+        <!--begin::Table Widget 8-->
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Recent Activities</span>
+                    <span class="text-muted mt-1 fw-bold fs-7">Activity Report</span>
+                </h3>
+                <div class="card-toolbar">
+
+                </div>
+            </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body py-3">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_8_tab_1">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+
+                                <tr>
+                                    <th class="p-0 w-90px">Date</th>
+                                    <th class="p-0 min-w-150px">Recipient</th>
+                                    <th class="p-0 w-60px">Amount/Fee</th>
+                                    <th class="p-0 min-w-100px">Conf/Status</th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <?php
+                                //var_dump($sendmoney_table_result);
+                                foreach( $sendmoney_table_result as $row){
+                                    ?>
+                                    <tr>
+                                        <td>
+                                            <?=$row->date?>
+                                        </td>
+                                        <td>
+                                            <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6"><?=$row->recitient?></a>
+                                            <span class="text-muted fw-bold d-block fs-7"></span>
+                                        </td>
+                                        <td>
+                                            <?=$row->amount?><br><?=$row->fee?>
+                                        </td>
+                                        <td class="text-end">
+                                            <span class="text-dark fw-bolder d-block fs-7"><?=$row->confirmation?></span>
+                                            <span class="text-muted fw-bold d-block fs-8"><?=$row->status?></span>
+                                        </td>
+                                        <td class="text-end">
+                                            <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                                <i class="bi bi-three-dots fs-5"></i>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                    <?php
+                                }
+                                ?>
+
+
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+
+
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade" id="kt_table_widget_8_tab_2">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr>
+                                    <th class="p-0 w-50px"></th>
+                                    <th class="p-0 min-w-150px"></th>
+                                    <th class="p-0 min-w-120px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-info">
+																					<!--begin::Svg Icon | path: icons/duotune/maps/map004.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-info">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18.4 5.59998C21.9 9.09998 21.9 14.8 18.4 18.3C14.9 21.8 9.2 21.8 5.7 18.3L18.4 5.59998Z" fill="black" />
+																							<path d="M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12C22 6.5 17.5 2 12 2ZM19.9 11H13V8.8999C14.9 8.6999 16.7 8.00005 18.1 6.80005C19.1 8.00005 19.7 9.4 19.9 11ZM11 19.8999C9.7 19.6999 8.39999 19.2 7.39999 18.5C8.49999 17.7 9.7 17.2001 11 17.1001V19.8999ZM5.89999 6.90002C7.39999 8.10002 9.2 8.8 11 9V11.1001H4.10001C4.30001 9.4001 4.89999 8.00002 5.89999 6.90002ZM7.39999 5.5C8.49999 4.7 9.7 4.19998 11 4.09998V7C9.7 6.8 8.39999 6.3 7.39999 5.5ZM13 17.1001C14.3 17.3001 15.6 17.8 16.6 18.5C15.5 19.3 14.3 19.7999 13 19.8999V17.1001ZM13 4.09998C14.3 4.29998 15.6 4.8 16.6 5.5C15.5 6.3 14.3 6.80002 13 6.90002V4.09998ZM4.10001 13H11V15.1001C9.1 15.3001 7.29999 16 5.89999 17.2C4.89999 16 4.30001 14.6 4.10001 13ZM18.1 17.1001C16.6 15.9001 14.8 15.2 13 15V12.8999H19.9C19.7 14.5999 19.1 16.0001 18.1 17.1001Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Who Knows Geography</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Zoey Dylan</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">3:22PM, 07 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-warning">
+																					<!--begin::Svg Icon | path: icons/duotune/general/gen025.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-warning">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<rect x="2" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="13" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="2" y="13" width="9" height="9" rx="2" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Maths Championship</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Tom Gere</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">10:05PM, 25 Oct</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-danger">
+																					<!--begin::Svg Icon | path: icons/duotune/coding/cod002.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-danger">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18 22C19.7 22 21 20.7 21 19C21 18.5 20.9 18.1 20.7 17.7L15.3 6.30005C15.1 5.90005 15 5.5 15 5C15 3.3 16.3 2 18 2H6C4.3 2 3 3.3 3 5C3 5.5 3.1 5.90005 3.3 6.30005L8.7 17.7C8.9 18.1 9 18.5 9 19C9 20.7 7.7 22 6 22H18Z" fill="black" />
+																							<path d="M18 2C19.7 2 21 3.3 21 5H9C9 3.3 7.7 2 6 2H18Z" fill="black" />
+																							<path d="M9 19C9 20.7 7.7 22 6 22C4.3 22 3 20.7 3 19H9Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">School Music Festival</a>
+                                        <span class="text-muted fw-bold d-block fs-7">by Rose Liam</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">4:20PM, 03 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade" id="kt_table_widget_8_tab_3">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr>
+                                    <th class="p-0 w-50px"></th>
+                                    <th class="p-0 min-w-150px"></th>
+                                    <th class="p-0 min-w-120px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-warning">
+																					<!--begin::Svg Icon | path: icons/duotune/general/gen025.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-warning">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<rect x="2" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="13" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="2" y="13" width="9" height="9" rx="2" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Maths Championship</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Tom Gere</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">10:05PM, 25 Oct</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-info">
+																					<!--begin::Svg Icon | path: icons/duotune/maps/map004.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-info">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18.4 5.59998C21.9 9.09998 21.9 14.8 18.4 18.3C14.9 21.8 9.2 21.8 5.7 18.3L18.4 5.59998Z" fill="black" />
+																							<path d="M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12C22 6.5 17.5 2 12 2ZM19.9 11H13V8.8999C14.9 8.6999 16.7 8.00005 18.1 6.80005C19.1 8.00005 19.7 9.4 19.9 11ZM11 19.8999C9.7 19.6999 8.39999 19.2 7.39999 18.5C8.49999 17.7 9.7 17.2001 11 17.1001V19.8999ZM5.89999 6.90002C7.39999 8.10002 9.2 8.8 11 9V11.1001H4.10001C4.30001 9.4001 4.89999 8.00002 5.89999 6.90002ZM7.39999 5.5C8.49999 4.7 9.7 4.19998 11 4.09998V7C9.7 6.8 8.39999 6.3 7.39999 5.5ZM13 17.1001C14.3 17.3001 15.6 17.8 16.6 18.5C15.5 19.3 14.3 19.7999 13 19.8999V17.1001ZM13 4.09998C14.3 4.29998 15.6 4.8 16.6 5.5C15.5 6.3 14.3 6.80002 13 6.90002V4.09998ZM4.10001 13H11V15.1001C9.1 15.3001 7.29999 16 5.89999 17.2C4.89999 16 4.30001 14.6 4.10001 13ZM18.1 17.1001C16.6 15.9001 14.8 15.2 13 15V12.8999H19.9C19.7 14.5999 19.1 16.0001 18.1 17.1001Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Who Knows Geography</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Zoey Dylan</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">3:22PM, 07 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-primary">
+																					<!--begin::Svg Icon | path: icons/duotune/abstract/abs027.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-primary">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M21.25 18.525L13.05 21.825C12.35 22.125 11.65 22.125 10.95 21.825L2.75 18.525C1.75 18.125 1.75 16.725 2.75 16.325L4.04999 15.825L10.25 18.325C10.85 18.525 11.45 18.625 12.05 18.625C12.65 18.625 13.25 18.525 13.85 18.325L20.05 15.825L21.35 16.325C22.35 16.725 22.35 18.125 21.25 18.525ZM13.05 16.425L21.25 13.125C22.25 12.725 22.25 11.325 21.25 10.925L13.05 7.62502C12.35 7.32502 11.65 7.32502 10.95 7.62502L2.75 10.925C1.75 11.325 1.75 12.725 2.75 13.125L10.95 16.425C11.65 16.725 12.45 16.725 13.05 16.425Z" fill="black" />
+																							<path d="M11.05 11.025L2.84998 7.725C1.84998 7.325 1.84998 5.925 2.84998 5.525L11.05 2.225C11.75 1.925 12.45 1.925 13.15 2.225L21.35 5.525C22.35 5.925 22.35 7.325 21.35 7.725L13.05 11.025C12.45 11.325 11.65 11.325 11.05 11.025Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Napoleon Days</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Luke Owen</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">1:20PM, 02 Dec</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-danger">
+																					<!--begin::Svg Icon | path: icons/duotune/coding/cod002.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-danger">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18 22C19.7 22 21 20.7 21 19C21 18.5 20.9 18.1 20.7 17.7L15.3 6.30005C15.1 5.90005 15 5.5 15 5C15 3.3 16.3 2 18 2H6C4.3 2 3 3.3 3 5C3 5.5 3.1 5.90005 3.3 6.30005L8.7 17.7C8.9 18.1 9 18.5 9 19C9 20.7 7.7 22 6 22H18Z" fill="black" />
+																							<path d="M18 2C19.7 2 21 3.3 21 5H9C9 3.3 7.7 2 6 2H18Z" fill="black" />
+																							<path d="M9 19C9 20.7 7.7 22 6 22C4.3 22 3 20.7 3 19H9Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">School Music Festival</a>
+                                        <span class="text-muted fw-bold d-block fs-7">by Rose Liam</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">4:20PM, 03 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+                </div>
+            </div>
+            <!--end::Body-->
+        </div>
+        <!--end::Tables Widget 8-->
+    </div>
+    <!--end::Col-->
 </div>
-
+<!--end::Row-->
 

www/application/views/users/view_dash.php

@@ -2,6 +2,282 @@
     <input type="hidden" name="jobOfferID" value="">
     <input type="hidden" name="jobID" value="">
 </form>
+
+<!--begin::Row-->
+<div class="row g-5 g-xl-8">
+    <!--begin::Col-->
+    <div class="col-xl-6">
+        <!--begin::Tables Widget 5-->
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1"<?=$dash_title?></span>
+                </h3>
+                <div class="card-toolbar">
+
+                </div>
+            </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body py-3">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table table-row-dashed table-row-gray-200 align-middle gs-0 gy-4">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr class="border-0">
+                                    <th class="p-0 w-100px">Added/Expire</th>
+                                    <th class="p-0 min-w-125px">Title</th>
+                                    <th class="p-0 min-w-135px">Target</th>
+                                    <th class="p-0 min-w-90px">Status</th>
+                                    <th class="p-0 min-w-50px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <?php
+                                if ($offer_found == true ){
+
+
+                                foreach ($offer_dash_result as $row)
+                                {
+                                    ?>
+                                    <tr>
+                                        <td>
+                                            <div class="symbol symbol-45px me-2">
+
+                                                     <?= $row->pdate ?>
+
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">  <?= $row->title ?></a>
+                                            <span class="text-muted fw-bold d-block">Movie Creator</span>
+                                        </td>
+                                        <td class="text-end text-muted fw-bold"><?= $row->trec ?></td>
+                                        <td class="text-end">
+                                            <span class="badge badge-light-success"><?= $row->status ?></span>
+                                        </td>
+                                        <td class="text-end">
+                                            <a href="#" onclick="return post_nav_find_action('<?=$row->qpath?>','<?=$row->offer_code?>')"  class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                                <!--begin::Svg Icon | path: icons/duotune/arrows/arr064.svg-->
+                                                <span class="svg-icon svg-icon-2">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                                                    <rect opacity="0.5" x="18" y="13" width="13" height="2" rx="1" transform="rotate(-180 18 13)" fill="black" />
+                                                    <path d="M15.4343 12.5657L11.25 16.75C10.8358 17.1642 10.8358 17.8358 11.25 18.25C11.6642 18.6642 12.3358 18.6642 12.75 18.25L18.2929 12.7071C18.6834 12.3166 18.6834 11.6834 18.2929 11.2929L12.75 5.75C12.3358 5.33579 11.6642 5.33579 11.25 5.75C10.8358 6.16421 10.8358 6.83579 11.25 7.25L15.4343 11.4343C15.7467 11.7467 15.7467 12.2533 15.4343 12.5657Z" fill="black" />
+                                                    </svg>
+                                                </span>
+                                                <!--end::Svg Icon-->
+                                            </a>
+                                        </td>
+                                    </tr>
+                                <?php
+                                } }
+                                ?>
+
+
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+
+                </div>
+            </div>
+            <!--end::Body-->
+        </div>
+        <!--end::Tables Widget 5-->
+    </div>
+    <!--end::Col-->
+    <!--begin::Col-->
+    <div class="col-xl-6">
+        <!--begin::Tables Widget 5-->
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Active Projects</span>
+                </h3>
+                <div class="card-toolbar">
+
+                </div>
+            </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body py-3">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table table-row-dashed table-row-gray-200 align-middle gs-0 gy-4">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr class="border-0">
+                                    <th class="p-0 min-w-180px">Job</th>
+                                    <th class="p-0 min-w-180px">Title/Description</th>
+                                    <th class="p-0 min-w-90px">Status</th>
+                                    <th class="p-0 min-w-50px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <?php
+                                foreach ($job_table_result as $row)
+                                {
+                                    ?>
+                                    <tr>
+
+                                        <td>
+                                            <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">  <?= $row->project ?></a>
+                                        </td>
+                                        <td><?= $row->description ?></td>
+                                        <td class="text-end">
+                                            <span class="badge badge-light-success"></span>
+                                        </td>
+                                        <td class="text-end">
+                                            <a href="#" onclick="return post_nav_find_action('<?=$row->qpath?>','<?=$row->offer_id?>')"  class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                                <!--begin::Svg Icon | path: icons/duotune/arrows/arr064.svg-->
+                                                <span class="svg-icon svg-icon-2">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                                                    <rect opacity="0.5" x="18" y="13" width="13" height="2" rx="1" transform="rotate(-180 18 13)" fill="black" />
+                                                    <path d="M15.4343 12.5657L11.25 16.75C10.8358 17.1642 10.8358 17.8358 11.25 18.25C11.6642 18.6642 12.3358 18.6642 12.75 18.25L18.2929 12.7071C18.6834 12.3166 18.6834 11.6834 18.2929 11.2929L12.75 5.75C12.3358 5.33579 11.6642 5.33579 11.25 5.75C10.8358 6.16421 10.8358 6.83579 11.25 7.25L15.4343 11.4343C15.7467 11.7467 15.7467 12.2533 15.4343 12.5657Z" fill="black" />
+                                                    </svg>
+                                                </span>
+                                                <!--end::Svg Icon-->
+                                            </a>
+                                        </td>
+                                    </tr>
+                                    <?php
+                                }
+                                ?>
+
+
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+
+                </div>
+            </div>
+            <!--end::Body-->
+        </div>
+        <!--end::Tables Widget 5-->
+    </div>
+    <!--end::Col-->
+</div>
+<!--end::Row-->
+<!--begin::Row-->
+<div class="row g-5 g-xl-8">
+    <div class="col-xl-12">
+        <!--begin::Charts Widget 1-->
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <!--begin::Title-->
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Recent Task Message</span>
+                </h3>
+                <!--end::Title-->
+
+            </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table table-row-dashed table-row-gray-200 align-middle gs-0 gy-4">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr class="border-0">
+                                    <th class="p-0 w-100px">Date</th>
+                                    <th class="p-0 min-w-125px">Title/Message</th>
+                                    <th class="p-0 min-w-50px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <?php
+                                if ($message_found == true ){
+
+
+                                    foreach ($job_message_table_result as $row)
+                                    {
+                                        ?>
+                                        <tr>
+                                            <td>
+                                                <div class="symbol symbol-45px me-2">
+
+                                                     <?= $row->date_contract ?>
+
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">  <?= $row->title ?></a>
+                                                <span class="text-muted fw-bold d-block"><?=$row->title_message?></span>
+                                            </td>
+
+                                            <td class="text-end">
+                                                <a href="#" onclick="return post_nav_find_action('<?=$row->qpath?>','<?=$row->offer_code?>')"  class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                                    <!--begin::Svg Icon | path: icons/duotune/arrows/arr064.svg-->
+                                                    <span class="svg-icon svg-icon-2">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                                                    <rect opacity="0.5" x="18" y="13" width="13" height="2" rx="1" transform="rotate(-180 18 13)" fill="black" />
+                                                    <path d="M15.4343 12.5657L11.25 16.75C10.8358 17.1642 10.8358 17.8358 11.25 18.25C11.6642 18.6642 12.3358 18.6642 12.75 18.25L18.2929 12.7071C18.6834 12.3166 18.6834 11.6834 18.2929 11.2929L12.75 5.75C12.3358 5.33579 11.6642 5.33579 11.25 5.75C10.8358 6.16421 10.8358 6.83579 11.25 7.25L15.4343 11.4343C15.7467 11.7467 15.7467 12.2533 15.4343 12.5657Z" fill="black" />
+                                                    </svg>
+                                                </span>
+                                                    <!--end::Svg Icon-->
+                                                </a>
+                                            </td>
+                                        </tr>
+                                        <?php
+                                    } }
+                                ?>
+
+
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+
+                </div>
+
+
+            </div>
+            <!--end::Body-->
+        </div>
+        <!--end::Charts Widget 1-->
+    </div>
+</div>
+<!--end::Row-->
+
+
+
+<?php //include('common/othermenu.php'); ?>
+<?php //include('common/iconmenu.php'); ?>
+
+
 <script type="text/javascript">
     <!--
        function post_nav_find_action(what, value) {
@@ -13,94 +289,15 @@
         return false;
     }
     // -->
-</script> 
+</script>
-
-<!-- Main content -->
-<div class="content-wrapper">
-    <?php include('common/userstrip.php'); ?>
-    <!-- Main charts -->
-    <div class="row">
-        <div class="col-lg-12">
-
-        </div>
-    </div>
-    <!-- /main charts -->
-    <div class="row">
-
-        <div id="myCarousel" class="carousel slide" data-ride="carousel">
-            <!-- Carousel indicators -->
-            <ol class="carousel-indicators">
-                <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
-                <li data-target="#myCarousel" data-slide-to="1"></li>
-                <li data-target="#myCarousel" data-slide-to="2"></li>
-            </ol>   
-            <!-- Wrapper for carousel items -->
-            <div class="carousel-inner">
-                <div class="item active">
-                    <div class="col-md-12">            
-                        <div class="panel panel-flat"  style="height: 435px;">
-                            <div class="panel-heading">
-                                <h6 class="panel-title"><b><?php echo $dash_title; ?></b></h6>
-                            </div>                
-                            <?php echo $offer_dash; ?>
-                        </div>
-                    </div>
-                </div>
-                <div class="item">
-                    <div class="col-md-12">            
-                        <div class="panel panel-flat"  style="height: 435px;">
-                            <div class="panel-heading">
-                                <h6 class="panel-title"><b>Active Projects</b></h6>
-                            </div>                
-                            <?php echo $job_table; ?>
-                        </div>
-                    </div>
-                </div>
-                <div class="item">
-                    <div class="col-md-12">            
-                        <div class="panel panel-flat"  style="height: 435px;">
-                            <div class="panel-heading">
-                                <h6 class="panel-title"><b>Recent Task Message</b></h6>
-                            </div>                
-                            <?php echo $job_message_table; ?>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
 
 
 
-
-
-
-
-
-        <!--div class="col-md-3">
-            <div class="thumbnail">
-                <div class="thumb">
-                    <a href="/proj/active" class="text-default"><img src="assets/images/activeproject_dash.png" alt="Active Projects"></a>
-                </div>
-
-                <div class="caption">
-                    <h6 class="no-margin-top text-semibold"><a href="/proj/active" class="text-default">My Active Projects</a> <a href="/proj/active" class="text-muted"><i class="icon-download pull-right"></i></a></h6>
-                    View active project. manage list and communication with deliverables.
-                </div>
-            </div>
-        </div-->
-    </div>
-    <?php include('common/othermenu.php'); ?>
-    <?php //include('common/iconmenu.php'); ?>  
-
-</div>
-<!-- /main content -->
-
 <script type="text/javascript">
 <!--
 
 function showModal(interest_id) {
-    if (typeof event !== 'undefined') {    
+    if (typeof event !== 'undefined') {
         event.preventDefault();
     }
     // collect data - either from forms or from data variables
@@ -126,7 +323,7 @@ function showModal(interest_id) {
 }
 
 function showJobModal(contact_id) {
-    if (typeof event !== 'undefined') {    
+    if (typeof event !== 'undefined') {
         event.preventDefault();
     }
     // collect data - either from forms or from data variables

www/application/views/users/view_external_footer.php

@@ -11,12 +11,12 @@
 
                 <div class="navbar-right">
                     <ul class="nav navbar-nav">
-                        <li><a href="/">Home</a></li>
+                        <li><a href="https://www.wrenchboard.com/">Home</a></li>
-                        <li><a href="/registration">Sign Up</a></li>
+                        <li><a href="/signup">Sign Up</a></li>
                         <li><a href="/login">Login</a></li>
-                        <li><a href="/about">About</a></li>
+                        <li><a href="https://www.wrenchboard.com/about-us">About</a></li>
-                        <li><a href="/terms">Terms</a></li>
+                        <li><a href="https://www.wrenchboard.com/terms">Terms</a></li>
-                        <li><a href="/contact">Contact</a></li>
+                        <li><a href="https://www.wrenchboard.com/contact">Contact</a></li>
                     </ul>
                 </div>
             </div>

www/application/views/users/view_finalwithdraw.php

@@ -1,74 +1,402 @@
 <!-- Main content -->
-<div class="content-wrapper">
+<?php include('common/userstrip.php'); ?>
 
-    <?php include('common/userstrip.php'); ?>
+<!--begin::Row-->
+<div class="row g-5 g-xl-8">
+    <!--begin::Col-->
+    <div class="col-xl-6">
+        <!--begin::Tables Widget 3-->
+        <div class="card card-xl-stretch mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Withdraw Confirmation</span>
+                    <span class="text-muted mt-1 fw-bold fs-7">Account Balance :<? echo money_format('%i', $current_balance * 0.01); ?> Naira</span>
+                </h3>
+                <div class="card-toolbar">
 
-    <!-- Marketing campaigns -->
-    <div class="panel panel-flat">
-        <div class="row">
-            <div class="col-lg-6">
-                <div class="panel-heading">
-                    <h4 class="no-margin">Account Balance :<? echo money_format('%i', $current_balance * 0.01); ?> Naira</h4>
                 </div>
             </div>
-            <div class="col-lg-6">
+            <!--end::Header-->
-                <div class="panel-heading">
+            <!--begin::Body-->
-                    <h5 class="no-margin">Escrow Balance :<? echo money_format('%i', $escrow_balance * 0.01); ?> Naira</h5>
+            <div class="card-body py-3">
-                </div> 
+                <!--begin::Table container-->
+                <table class='table table-striped table-hover table-bordered table-condensed'>
+
+                    <tbody>
+                    <tr>
+                        <td style='width: 120px;'>Amount Received:</td><td><?php echo $amount * 0.01; ?> Naira </td>
+                    </tr>
+                    <tr>
+                        <td style='width: 120px;'>Processing Fee:</td><td><?php echo $fee * 0.01; ?> Naira </td>
+                    </tr>
+                    <tr>
+                        <td style='width: 120px;'>Recipient:</td><td><?php echo $rec_firstname;?>  <?php echo $rec_lastname;?>  </td>
+                    </tr>
+                    <tr>
+                        <td style='width: 120px;'>Account No:</td><td><?php echo $account_no; ?> </td>
+                    </tr>
+                    <tr>
+                        <td style='width: 120px;'>Bank:</td><td><?php echo $bank_name; ?> </td>
+                    </tr>
+                    <tr>
+                        <td style='width: 120px;'>Confirmation No:</td><td><?php echo $confirmation; ?> </td>
+                    </tr>
+                    <tr>
+                        <td style='width: 120px;'></td><td><?php echo $sendmoney_message;?> </td>
+                    </tr>
+
+
+                    </tbody>
+                </table>
+
+                <!--end::Table container-->
             </div>
+            <!--begin::Body-->
         </div>
+        <!--end::Tables Widget 3-->
     </div>
-    <!-- /marketing campaigns -->
+    <!--end::Col-->
+    <!--begin::Col-->
+    <div class="col-xl-6">
+        <!--begin::Table Widget 8-->
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Recent Activities</span>
+                    <span class="text-muted mt-1 fw-bold fs-7">Activity Report</span>
+                </h3>
+                <div class="card-toolbar">
 
-    <!-- Marketing campaigns -->
+                </div>
-    <div class="panel panel-flat">
+            </div>
-        <div class="panel-heading">
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body py-3">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_8_tab_1">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+
+                                <tr>
+                                    <th class="p-0 w-90px">Date</th>
+                                    <th class="p-0 min-w-150px">Recipient</th>
+                                    <th class="p-0 w-60px">Amount/Fee</th>
+                                    <th class="p-0 min-w-100px">Conf/Status</th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <?php
+                                //var_dump($sendmoney_table_result);
+                                foreach( $sendmoney_table_result as $row){
+                                    ?>
+                                    <tr>
+                                        <td>
+                                            <?=$row->date?>
+                                        </td>
+                                        <td>
+                                            <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6"><?=$row->recitient?></a>
+                                            <span class="text-muted fw-bold d-block fs-7"></span>
+                                        </td>
+                                        <td>
+                                            <?=$row->amount?><br><?=$row->fee?>
+                                        </td>
+                                        <td class="text-end">
+                                            <span class="text-dark fw-bolder d-block fs-7"><?=$row->confirmation?></span>
+                                            <span class="text-muted fw-bold d-block fs-8"><?=$row->status?></span>
+                                        </td>
+                                        <td class="text-end">
+                                            <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                                <i class="bi bi-three-dots fs-5"></i>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                    <?php
+                                }
+                                ?>
 
 
-            <div class="panel-heading">
+                                </tbody>
-                <div class="row">
+                                <!--end::Table body-->
-                    <div class="col-md-10 col-md-offset-1">
+                            </table>
-                        <h5 class="panel-title">Withdraw Confirmation</h5>
-
-                        <table class='table table-striped table-hover table-bordered table-condensed'>
-                        
-                            <tbody>
-                                <tr>
-                                    <td style='width: 120px;'>Amount Received:</td><td><?php echo $amount * 0.01; ?> Naira </td>
-                                </tr>
-                                <tr>
-                                    <td style='width: 120px;'>Processing Fee:</td><td><?php echo $fee * 0.01; ?> Naira </td>
-                                </tr>
-                                <tr>
-                                    <td style='width: 120px;'>Recipient:</td><td><?php echo $rec_firstname;?>  <?php echo $rec_lastname;?>  </td>
-                                </tr>
-                                <tr>
-                                    <td style='width: 120px;'>Account No:</td><td><?php echo $account_no; ?> </td>
-                                </tr>
-                                <tr>
-                                    <td style='width: 120px;'>Bank:</td><td><?php echo $bank_name; ?> </td>
-                                </tr>
-                                <tr>
-                                    <td style='width: 120px;'>Confirmation No:</td><td><?php echo $confirmation; ?> </td>
-                                </tr>
-                                <tr>
-                                    <td style='width: 120px;'></td><td><?php echo $sendmoney_message;?> </td>
-                                </tr>
 
 
-                            </tbody>
+                        </div>
-                        </table>  
+                        <!--end::Table-->
-                        
                     </div>
+                    <!--end::Tap pane-->
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade" id="kt_table_widget_8_tab_2">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr>
+                                    <th class="p-0 w-50px"></th>
+                                    <th class="p-0 min-w-150px"></th>
+                                    <th class="p-0 min-w-120px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-info">
+																					<!--begin::Svg Icon | path: icons/duotune/maps/map004.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-info">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18.4 5.59998C21.9 9.09998 21.9 14.8 18.4 18.3C14.9 21.8 9.2 21.8 5.7 18.3L18.4 5.59998Z" fill="black" />
+																							<path d="M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12C22 6.5 17.5 2 12 2ZM19.9 11H13V8.8999C14.9 8.6999 16.7 8.00005 18.1 6.80005C19.1 8.00005 19.7 9.4 19.9 11ZM11 19.8999C9.7 19.6999 8.39999 19.2 7.39999 18.5C8.49999 17.7 9.7 17.2001 11 17.1001V19.8999ZM5.89999 6.90002C7.39999 8.10002 9.2 8.8 11 9V11.1001H4.10001C4.30001 9.4001 4.89999 8.00002 5.89999 6.90002ZM7.39999 5.5C8.49999 4.7 9.7 4.19998 11 4.09998V7C9.7 6.8 8.39999 6.3 7.39999 5.5ZM13 17.1001C14.3 17.3001 15.6 17.8 16.6 18.5C15.5 19.3 14.3 19.7999 13 19.8999V17.1001ZM13 4.09998C14.3 4.29998 15.6 4.8 16.6 5.5C15.5 6.3 14.3 6.80002 13 6.90002V4.09998ZM4.10001 13H11V15.1001C9.1 15.3001 7.29999 16 5.89999 17.2C4.89999 16 4.30001 14.6 4.10001 13ZM18.1 17.1001C16.6 15.9001 14.8 15.2 13 15V12.8999H19.9C19.7 14.5999 19.1 16.0001 18.1 17.1001Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Who Knows Geography</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Zoey Dylan</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">3:22PM, 07 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-warning">
+																					<!--begin::Svg Icon | path: icons/duotune/general/gen025.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-warning">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<rect x="2" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="13" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="2" y="13" width="9" height="9" rx="2" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Maths Championship</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Tom Gere</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">10:05PM, 25 Oct</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-danger">
+																					<!--begin::Svg Icon | path: icons/duotune/coding/cod002.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-danger">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18 22C19.7 22 21 20.7 21 19C21 18.5 20.9 18.1 20.7 17.7L15.3 6.30005C15.1 5.90005 15 5.5 15 5C15 3.3 16.3 2 18 2H6C4.3 2 3 3.3 3 5C3 5.5 3.1 5.90005 3.3 6.30005L8.7 17.7C8.9 18.1 9 18.5 9 19C9 20.7 7.7 22 6 22H18Z" fill="black" />
+																							<path d="M18 2C19.7 2 21 3.3 21 5H9C9 3.3 7.7 2 6 2H18Z" fill="black" />
+																							<path d="M9 19C9 20.7 7.7 22 6 22C4.3 22 3 20.7 3 19H9Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">School Music Festival</a>
+                                        <span class="text-muted fw-bold d-block fs-7">by Rose Liam</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">4:20PM, 03 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade" id="kt_table_widget_8_tab_3">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr>
+                                    <th class="p-0 w-50px"></th>
+                                    <th class="p-0 min-w-150px"></th>
+                                    <th class="p-0 min-w-120px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-warning">
+																					<!--begin::Svg Icon | path: icons/duotune/general/gen025.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-warning">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<rect x="2" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="13" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="2" y="13" width="9" height="9" rx="2" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Maths Championship</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Tom Gere</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">10:05PM, 25 Oct</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-info">
+																					<!--begin::Svg Icon | path: icons/duotune/maps/map004.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-info">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18.4 5.59998C21.9 9.09998 21.9 14.8 18.4 18.3C14.9 21.8 9.2 21.8 5.7 18.3L18.4 5.59998Z" fill="black" />
+																							<path d="M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12C22 6.5 17.5 2 12 2ZM19.9 11H13V8.8999C14.9 8.6999 16.7 8.00005 18.1 6.80005C19.1 8.00005 19.7 9.4 19.9 11ZM11 19.8999C9.7 19.6999 8.39999 19.2 7.39999 18.5C8.49999 17.7 9.7 17.2001 11 17.1001V19.8999ZM5.89999 6.90002C7.39999 8.10002 9.2 8.8 11 9V11.1001H4.10001C4.30001 9.4001 4.89999 8.00002 5.89999 6.90002ZM7.39999 5.5C8.49999 4.7 9.7 4.19998 11 4.09998V7C9.7 6.8 8.39999 6.3 7.39999 5.5ZM13 17.1001C14.3 17.3001 15.6 17.8 16.6 18.5C15.5 19.3 14.3 19.7999 13 19.8999V17.1001ZM13 4.09998C14.3 4.29998 15.6 4.8 16.6 5.5C15.5 6.3 14.3 6.80002 13 6.90002V4.09998ZM4.10001 13H11V15.1001C9.1 15.3001 7.29999 16 5.89999 17.2C4.89999 16 4.30001 14.6 4.10001 13ZM18.1 17.1001C16.6 15.9001 14.8 15.2 13 15V12.8999H19.9C19.7 14.5999 19.1 16.0001 18.1 17.1001Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Who Knows Geography</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Zoey Dylan</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">3:22PM, 07 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-primary">
+																					<!--begin::Svg Icon | path: icons/duotune/abstract/abs027.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-primary">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M21.25 18.525L13.05 21.825C12.35 22.125 11.65 22.125 10.95 21.825L2.75 18.525C1.75 18.125 1.75 16.725 2.75 16.325L4.04999 15.825L10.25 18.325C10.85 18.525 11.45 18.625 12.05 18.625C12.65 18.625 13.25 18.525 13.85 18.325L20.05 15.825L21.35 16.325C22.35 16.725 22.35 18.125 21.25 18.525ZM13.05 16.425L21.25 13.125C22.25 12.725 22.25 11.325 21.25 10.925L13.05 7.62502C12.35 7.32502 11.65 7.32502 10.95 7.62502L2.75 10.925C1.75 11.325 1.75 12.725 2.75 13.125L10.95 16.425C11.65 16.725 12.45 16.725 13.05 16.425Z" fill="black" />
+																							<path d="M11.05 11.025L2.84998 7.725C1.84998 7.325 1.84998 5.925 2.84998 5.525L11.05 2.225C11.75 1.925 12.45 1.925 13.15 2.225L21.35 5.525C22.35 5.925 22.35 7.325 21.35 7.725L13.05 11.025C12.45 11.325 11.65 11.325 11.05 11.025Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Napoleon Days</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Luke Owen</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">1:20PM, 02 Dec</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-danger">
+																					<!--begin::Svg Icon | path: icons/duotune/coding/cod002.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-danger">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18 22C19.7 22 21 20.7 21 19C21 18.5 20.9 18.1 20.7 17.7L15.3 6.30005C15.1 5.90005 15 5.5 15 5C15 3.3 16.3 2 18 2H6C4.3 2 3 3.3 3 5C3 5.5 3.1 5.90005 3.3 6.30005L8.7 17.7C8.9 18.1 9 18.5 9 19C9 20.7 7.7 22 6 22H18Z" fill="black" />
+																							<path d="M18 2C19.7 2 21 3.3 21 5H9C9 3.3 7.7 2 6 2H18Z" fill="black" />
+																							<path d="M9 19C9 20.7 7.7 22 6 22C4.3 22 3 20.7 3 19H9Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">School Music Festival</a>
+                                        <span class="text-muted fw-bold d-block fs-7">by Rose Liam</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">4:20PM, 03 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
                 </div>
             </div>
-
+            <!--end::Body-->
-          
-
         </div>
+        <!--end::Tables Widget 8-->
     </div>
-    
+    <!--end::Col-->
-
 </div>
-
+<!--end::Row-->
 

www/application/views/users/view_footer_user.php

@@ -13,7 +13,7 @@
 
         <div class="navbar-collapse collapse" id="footer">
             <div class="navbar-text">
-                &copy; 2020. <a href="/dash" class="navbar-link">WrenchBoard</a> 
+                &copy; 2022. <a href="/dash" class="navbar-link">WrenchBoard</a> 
             </div>
 
             <div class="navbar-right">

www/application/views/users/view_header_user.php

@@ -14,6 +14,7 @@
         <link href="/assets/css/components.css" rel="stylesheet" type="text/css">
         <link href="/assets/css/colors.css" rel="stylesheet" type="text/css">
         <!-- /global stylesheets -->
+        <link rel="shortcut icon" href="/assets/ext/images/favicon.png">
 
         <!-- Core JS files -->
         <script type="text/javascript" src="/assets/js/plugins/loaders/pace.min.js"></script>
@@ -75,7 +76,7 @@
         <div class="navbar navbar-inverse bg-indigo">
             <div class="navbar-boxed">
                 <div class="navbar-header">
-                    <a class="navbar-brand" href="/dash"><div class='logo_text'>WrenchBoard</div></a>
+                    <a  href="/dash"><div><img src="/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></div></a>
 
                     <ul class="nav navbar-nav visible-xs-block">
                         <li><a data-toggle="collapse" data-target="#navbar-mobile"><i class="icon-tree5"></i></a></li>

www/application/views/users/view_login.php

@@ -165,7 +165,7 @@
                             </ul>
 
                             <div class="content-divider text-muted form-group"><span>Don't have an account?</span></div>
-                            <a href="registration" class="btn btn-info btn-block content-group">Sign up</a>
+                            <a href="/signup" class="btn btn-info btn-block content-group">Sign up</a>
 
                         </div>
                     </form>

www/application/views/users/view_message.php

@@ -1,16 +1,40 @@
-<!-- Main content -->
-<div class="content-wrapper">
-    <?php include('common/userstrip.php'); ?>
 
-    <div class="panel panel-flat">
+<?php include('common/userstrip.php'); ?>
-        <div class="panel-heading" style="height: 550px;">  
+<!--begin::Row-->
-            <h4>Message</h4>
+<div class="row g-5 g-xl-8">
-            <?php echo $message_table; ?>         
+    <div class="col-xl-12">
+        <!--begin::Charts Widget 1-->
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <!--begin::Title-->
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Messages</span>
+                </h3>
+                <!--end::Title-->
+
+            </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
+                        <?php echo $message_table; ?>
+                    </div>
+                    <!--end::Tap pane-->
+
+                </div>
+
+
+            </div>
+            <!--end::Body-->
         </div>
+        <!--end::Charts Widget 1-->
     </div>
-    <!-- /my messages -->
 </div>
-<!-- /main content -->
+<!--end::Row-->
+
 
 <!-- /main content -->
 <script type="text/javascript">

www/application/views/users/view_payment.php

@@ -1,16 +1,96 @@
-<div class="content-wrapper">
+<?php include('common/userstrip.php'); ?>
-    <?php include('common/userstrip.php'); ?>
+<!--begin::Row-->
-  
+<div class="row g-5 g-xl-8">
-    <div class="panel panel-flat" style='height: 550px;'>
+    <!--begin::Col-->
-        <div class="panel-heading">
+    <div class="col-xl-12">
-            <h5 class="panel-title">Payments</h5>             
+        <!--begin::Table Widget 7-->
-        </div>
+        <div class="card card-xl-stretch mb-xl-8">
-        <div class="panel-heading">
+            <!--begin::Header-->
-            <?php echo $payment_result; ?>
+            <div class="card-header border-0 pt-5">
-        </div>
+                <h3 class="card-title align-items-start flex-column">
-        <div class="panel-heading">
+                    <span class="card-label fw-bolder fs-3 mb-1">Payments</span>
-            <?php echo $links; ?>
+                </h3>
-        </div>
+                <div class="card-toolbar">
-    </div>
+                    <ul class="nav">
-</div>
+                        <?php echo $links; ?>
+                    </ul>
+                </div>
+            </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body py-3">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_7_tab_1">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr>
+                                    <th class="p-0 w-100px">Date</th>
+                                    <th class="p-0 min-w-150px">Description</th>
+                                    <th class="p-0 min-w-140px">Amount</th>
+                                    <th class="p-0 min-w-140px">Fee</th>
+                                    <th class="p-0 min-w-120px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <?php
+
+//var_dump($payment_data_result);
+
+                                foreach ($payment_data_result as $row)
+                                {
+                                ?>
+                                    <tr>
+                                        <td>
+                                          <?=$row->added?>
+                                        </td>
+                                        <td>
+                                            <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6"> <?=$row->description?></a>
+                                            <span class="text-muted fw-bold d-block fs-7"><?=$row->confirmation?></span>
+                                        </td>
+                                        <td class="text-start">
+                                            <span class="text-dark fw-bolder d-block fs-7"><?=$row->amount?></span>
+                                        </td>
+                                        <td class="text-start">
+                                            <span class="text-dark fw-bolder d-block fs-7"><?=$row->fee?></span>
+                                        </td>
+                                        <td class="text-end">
+                                            <span class="badge badge-light-success fs-7 fw-bolder">Completed</span>
+                                        </td>
+                                        <td class="text-end">
+                                            <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                                <i class="bi bi-three-dots fs-5"></i>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                <?php
+                                }
+                                ?>
+
+
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+
+                </div>
+            </div>
+            <!--end::Body-->
+        </div>
+        <!--end::Tables Widget 7-->
+    </div>
+    <!--end::Col-->
+
+</div>
+<!--end::Row-->
+
+
 

www/application/views/users/view_refer.php

@@ -1,76 +1,108 @@
-<!-- Main content -->
+<?php include('common/userstrip.php'); ?>
-<div class="content-wrapper">
+<?php
-    <?php include('common/userstrip.php'); ?>
+//var_dump($refer_table_result);
-    <!-- Marketing campaigns -->
+?>
+<!--begin::Row-->
+<div class="row g-5 g-xl-8">
+    <!--begin::Col-->
+    <div class="col-xl-6">
+        <!--begin::Table Widget 7-->
+        <div class="card card-xl-stretch mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Send Referrer</span>
 
+                </h3>
+                <div class="card-toolbar">
 
-
+                </div>
-
+            </div>
-    <div class="row">
+            <!--end::Header-->
-
+            <!--begin::Body-->
-
+            <div class="card-body py-3">
-        <div class="col-lg-9 col-sm-6">
+                <div class="tab-content">
-            <div class="thumbnail">
+                    <!--begin::Tap pane-->
-                <div class="caption">
+                    <div class="tab-pane fade show active" id="kt_table_widget_7_tab_1">
-
+                        <!--begin::Table container-->
-                    <div class="panel-body">
+                        <div class="table-responsive">
-                        <form class="form-horizontal" action="/refer/refpage" method='POST' name="refer_individual">
+                            <!--begin::Table-->
-                            <div class="form-group">
+                            <form class="form-horizontal" action="/refer/refpage" method='POST' name="refer_individual">
-                                <label class="control-label col-lg-2">Firstname :</label>
+                                <div class="form-group">
-                                <div class="col-lg-10">
+                                    <label class="control-label col-lg-2">Firstname :</label>
-                                    <input type="text" class="form-control" id="ref_firstname" name="ref_firstname" value="<?php echo $ref_firstname; ?>">
+                                    <div class="col-lg-10">
+                                        <input type="text" class="form-control" id="ref_firstname" name="ref_firstname" value="<?php echo $ref_firstname; ?>">
+                                    </div>
                                 </div>
-                            </div>
+                                <div class="form-group">
-                            <div class="form-group">
+                                    <label class="control-label col-lg-2">Lastname :</label>
-                                <label class="control-label col-lg-2">Lastname :</label>
+                                    <div class="col-lg-10">
-                                <div class="col-lg-10">
+                                        <input type="text" class="form-control" id="ref_lastname" name="ref_lastname"  value="<?php echo $ref_lastname; ?>">
-                                    <input type="text" class="form-control" id="ref_lastname" name="ref_lastname"  value="<?php echo $ref_lastname; ?>">
+                                    </div>
                                 </div>
-                            </div>
+                                <div class="form-group">
-                            <div class="form-group">
+                                    <label class="control-label col-lg-2">Email :</label>
-                                <label class="control-label col-lg-2">Email :</label>
+                                    <div class="col-lg-10">
-                                <div class="col-lg-10">
+                                        <input type="text" class="form-control" id="ref_email" name="ref_email"  value="<?php echo $ref_email; ?>" >
-                                    <input type="text" class="form-control" id="ref_email" name="ref_email"  value="<?php echo $ref_email; ?>" >
+                                    </div>
                                 </div>
-                            </div> 
 
-                            <div class="text-right">
+                                <div class="text-right">
-                                <button type="submit" class="btn btn-primary btn-xs" onclick="return referIndividual();">Send Message <i class="icon-arrow-right14 position-right"></i></button>
+                                    <button type="submit" class="btn btn-primary btn-xs" onclick="return referIndividual();">Send Message <i class="icon-arrow-right14 position-right"></i></button>
-                            </div>
+                                </div>
 
-                            <?php echo $status; ?>
+                                <?php echo $status; ?>
-                        </form>
+                            </form>
+                        </div>
+                        <!--end::Table-->
                     </div>
+                    <!--end::Tap pane-->
 
                 </div>
             </div>
-
+            <!--end::Body-->
-            <div class="thumbnail">               
-                <div class="caption">
-                    <? echo $refer_table; ?>
-                </div>
-                  <div class="panel-heading">
-            <?php echo $links; ?>
         </div>
-            </div>
+        <!--end::Tables Widget 7-->
-
-        </div>
-
-        <div class="col-lg-3 col-sm-6">
-            <div class="thumbnail">
-                <div class="thumb">
-                    <img src="/assets/images/refer_dash.jpg" alt="Refer A Friend">
-                </div>
-
-                <div class="caption">
-                    <h6 class="no-margin-top text-semibold"><a href="#" class="text-default">Refer A Friend</a> <a href="/refer" class="text-muted"></a></h6>
-                   Show WrenchBoard to your friends and get rewarded when they complete their job profile.
-                </div>
-            </div>
-        </div>
-
     </div>
+    <!--end::Col-->
+    <!--begin::Col-->
+    <div class="col-xl-6">
+        <!--begin::Table Widget 8-->
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Previous List</span>
+
+                </h3>
+                <div class="card-toolbar">
+
+                </div>
+            </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body py-3">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_8_tab_1">
+                        <!--begin::Table container-->
+                        <? echo $refer_table; ?>
+
+
+                        <!--end::Table-->
+                    </div>
+                    <?php echo $links; ?>
+                    <!--end::Tap pane-->
+
+                </div>
+            </div>
+            <!--end::Body-->
+        </div>
+        <!--end::Tables Widget 8-->
+    </div>
+    <!--end::Col-->
 </div>
+<!--end::Row-->
 
 <script type="text/javascript">
 <!--

www/application/views/users/view_smoney.php

@@ -0,0 +1,456 @@
+
+<?php include('common/userstrip.php'); ?>
+<!--begin::Row-->
+<div class="row g-5 g-xl-8">
+    <!--begin::Col-->
+    <div class="col-xl-6">
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <!--begin::Title-->
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Withdraw from Balance [<? echo money_format('%.2n', $current_balance * 0.01); ?>]</span>
+                </h3>
+                <!--end::Title-->
+
+            </div>
+            <!--end::Header-->
+            <div class="card-body">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
+                        <!--begin::Table container-->
+
+                        <form class="form-horizontal" action="/member/smoney" method='POST'>
+                            <div class="row">
+                                <div class="col-md-10 col-md-offset-1">
+
+
+                                </div>
+                            </div>
+
+
+                            <script type="text/javascript">
+                                <!--
+                                function getFee(val) {
+                                    $.ajax({
+                                        url: "/member/fee?amount=" + val
+                                    }).done(function (data) {
+                                        var fee = 0;
+                                        if (parseFloat(data) > 0) {
+                                            fee = parseFloat(data);
+                                        }
+                                        var total = fee + parseFloat(val);
+                                        $('#fee').val(fee.toFixed(2));
+                                        $('#total').val(total.toFixed(2));
+                                    });
+                                }
+                                // -->
+                            </script>
+                            <div class="panel-body">
+                                <div class="row">
+
+                                </div>
+                                <div class="col-md-10 col-md-offset-1">
+                                    <div class="form-group">
+                                        <label class="col-lg-3 control-label"> Amount:</label>
+                                        <div class="col-lg-9">
+                                            <input name ="amount" type="text" class="form-control" placeholder="Amount to withdraw" value="<?php echo $amount; ?>" onKeyUp="this.value = this.value.replace(/[^0-9]/g, '');getFee(this.value);" maxlength='6' onChange="getFee(this.value)">
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label class="col-lg-3 control-label">Recipient Acc:[<a href ='/member/recipient' class="label label-info">Add New</a>]</label>
+                                        <div class="col-lg-9">
+                                            <?php echo $recipient_account_combo; ?>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label class="col-lg-3 control-label">Processing Fee:</label>
+                                        <div class="col-lg-9">
+                                            <input name ="fee" id="fee" type="text" class="form-control" placeholder="Processing fee" value="<?php echo $fee * 0.01; ?>" readonly >
+                                        </div>
+                                    </div>
+
+
+                                    <div class="form-group">
+                                        <label class="col-lg-3 control-label"> Total :</label>
+                                        <div class="col-lg-9">
+                                            <input name ="total" id="total" type="text" class="form-control" placeholder="Total" value="<?php echo $total * 0.01; ?>" readonly >
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label class="col-lg-3 control-label"> Comment/Note :</label>
+                                        <div class="col-lg-9">
+                                            <input name="comment" type="text" class="form-control" placeholder="Comment" value="<?php echo $comment; ?>">
+                                        </div>
+                                    </div>
+
+                                    <div class="text-right">
+                                        <?php echo $add_error; ?>
+                                        <button type="submit" class="btn btn-primary btn-xs">Continue <i class="icon-arrow-right14 position-right"></i></button>
+                                    </div>
+
+                                </div>
+                            </div>
+
+                        </form>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+
+                </div>
+
+
+            </div>
+        </div>
+    </div>
+    <!--end::Col-->
+    <!--begin::Col-->
+    <div class="col-xl-6">
+        <!--begin::Table Widget 8-->
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Recent Activities</span>
+                    <span class="text-muted mt-1 fw-bold fs-7">Activity Report</span>
+                </h3>
+                <div class="card-toolbar">
+
+                </div>
+            </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body py-3">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_8_tab_1">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+
+                                <tr>
+                                    <th class="p-0 w-90px">Date</th>
+                                    <th class="p-0 min-w-150px">Recipient</th>
+                                    <th class="p-0 w-60px">Amount/Fee</th>
+                                    <th class="p-0 min-w-100px">Conf/Status</th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <?php
+                                //var_dump($sendmoney_table_result);
+                                foreach( $sendmoney_table_result as $row){
+                                    ?>
+                                    <tr>
+                                        <td>
+                                            <?=$row->date?>
+                                        </td>
+                                        <td>
+                                            <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6"><?=$row->recitient?></a>
+                                            <span class="text-muted fw-bold d-block fs-7"></span>
+                                        </td>
+                                        <td>
+                                            <?=$row->amount?><br><?=$row->fee?>
+                                        </td>
+                                        <td class="text-end">
+                                            <span class="text-dark fw-bolder d-block fs-7"><?=$row->confirmation?></span>
+                                            <span class="text-muted fw-bold d-block fs-8"><?=$row->status?></span>
+                                        </td>
+                                        <td class="text-end">
+                                            <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                                <i class="bi bi-three-dots fs-5"></i>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                    <?php
+                                }
+                                ?>
+
+
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+
+
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade" id="kt_table_widget_8_tab_2">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr>
+                                    <th class="p-0 w-50px"></th>
+                                    <th class="p-0 min-w-150px"></th>
+                                    <th class="p-0 min-w-120px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-info">
+																					<!--begin::Svg Icon | path: icons/duotune/maps/map004.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-info">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18.4 5.59998C21.9 9.09998 21.9 14.8 18.4 18.3C14.9 21.8 9.2 21.8 5.7 18.3L18.4 5.59998Z" fill="black" />
+																							<path d="M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12C22 6.5 17.5 2 12 2ZM19.9 11H13V8.8999C14.9 8.6999 16.7 8.00005 18.1 6.80005C19.1 8.00005 19.7 9.4 19.9 11ZM11 19.8999C9.7 19.6999 8.39999 19.2 7.39999 18.5C8.49999 17.7 9.7 17.2001 11 17.1001V19.8999ZM5.89999 6.90002C7.39999 8.10002 9.2 8.8 11 9V11.1001H4.10001C4.30001 9.4001 4.89999 8.00002 5.89999 6.90002ZM7.39999 5.5C8.49999 4.7 9.7 4.19998 11 4.09998V7C9.7 6.8 8.39999 6.3 7.39999 5.5ZM13 17.1001C14.3 17.3001 15.6 17.8 16.6 18.5C15.5 19.3 14.3 19.7999 13 19.8999V17.1001ZM13 4.09998C14.3 4.29998 15.6 4.8 16.6 5.5C15.5 6.3 14.3 6.80002 13 6.90002V4.09998ZM4.10001 13H11V15.1001C9.1 15.3001 7.29999 16 5.89999 17.2C4.89999 16 4.30001 14.6 4.10001 13ZM18.1 17.1001C16.6 15.9001 14.8 15.2 13 15V12.8999H19.9C19.7 14.5999 19.1 16.0001 18.1 17.1001Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Who Knows Geography</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Zoey Dylan</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">3:22PM, 07 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-warning">
+																					<!--begin::Svg Icon | path: icons/duotune/general/gen025.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-warning">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<rect x="2" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="13" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="2" y="13" width="9" height="9" rx="2" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Maths Championship</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Tom Gere</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">10:05PM, 25 Oct</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-danger">
+																					<!--begin::Svg Icon | path: icons/duotune/coding/cod002.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-danger">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18 22C19.7 22 21 20.7 21 19C21 18.5 20.9 18.1 20.7 17.7L15.3 6.30005C15.1 5.90005 15 5.5 15 5C15 3.3 16.3 2 18 2H6C4.3 2 3 3.3 3 5C3 5.5 3.1 5.90005 3.3 6.30005L8.7 17.7C8.9 18.1 9 18.5 9 19C9 20.7 7.7 22 6 22H18Z" fill="black" />
+																							<path d="M18 2C19.7 2 21 3.3 21 5H9C9 3.3 7.7 2 6 2H18Z" fill="black" />
+																							<path d="M9 19C9 20.7 7.7 22 6 22C4.3 22 3 20.7 3 19H9Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">School Music Festival</a>
+                                        <span class="text-muted fw-bold d-block fs-7">by Rose Liam</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">4:20PM, 03 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade" id="kt_table_widget_8_tab_3">
+                        <!--begin::Table container-->
+                        <div class="table-responsive">
+                            <!--begin::Table-->
+                            <table class="table align-middle gs-0 gy-3">
+                                <!--begin::Table head-->
+                                <thead>
+                                <tr>
+                                    <th class="p-0 w-50px"></th>
+                                    <th class="p-0 min-w-150px"></th>
+                                    <th class="p-0 min-w-120px"></th>
+                                </tr>
+                                </thead>
+                                <!--end::Table head-->
+                                <!--begin::Table body-->
+                                <tbody>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-warning">
+																					<!--begin::Svg Icon | path: icons/duotune/general/gen025.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-warning">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<rect x="2" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="2" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="13" y="13" width="9" height="9" rx="2" fill="black" />
+																							<rect opacity="0.3" x="2" y="13" width="9" height="9" rx="2" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Maths Championship</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Tom Gere</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">10:05PM, 25 Oct</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-info">
+																					<!--begin::Svg Icon | path: icons/duotune/maps/map004.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-info">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18.4 5.59998C21.9 9.09998 21.9 14.8 18.4 18.3C14.9 21.8 9.2 21.8 5.7 18.3L18.4 5.59998Z" fill="black" />
+																							<path d="M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12C22 6.5 17.5 2 12 2ZM19.9 11H13V8.8999C14.9 8.6999 16.7 8.00005 18.1 6.80005C19.1 8.00005 19.7 9.4 19.9 11ZM11 19.8999C9.7 19.6999 8.39999 19.2 7.39999 18.5C8.49999 17.7 9.7 17.2001 11 17.1001V19.8999ZM5.89999 6.90002C7.39999 8.10002 9.2 8.8 11 9V11.1001H4.10001C4.30001 9.4001 4.89999 8.00002 5.89999 6.90002ZM7.39999 5.5C8.49999 4.7 9.7 4.19998 11 4.09998V7C9.7 6.8 8.39999 6.3 7.39999 5.5ZM13 17.1001C14.3 17.3001 15.6 17.8 16.6 18.5C15.5 19.3 14.3 19.7999 13 19.8999V17.1001ZM13 4.09998C14.3 4.29998 15.6 4.8 16.6 5.5C15.5 6.3 14.3 6.80002 13 6.90002V4.09998ZM4.10001 13H11V15.1001C9.1 15.3001 7.29999 16 5.89999 17.2C4.89999 16 4.30001 14.6 4.10001 13ZM18.1 17.1001C16.6 15.9001 14.8 15.2 13 15V12.8999H19.9C19.7 14.5999 19.1 16.0001 18.1 17.1001Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Who Knows Geography</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Zoey Dylan</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">3:22PM, 07 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-primary">
+																					<!--begin::Svg Icon | path: icons/duotune/abstract/abs027.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-primary">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M21.25 18.525L13.05 21.825C12.35 22.125 11.65 22.125 10.95 21.825L2.75 18.525C1.75 18.125 1.75 16.725 2.75 16.325L4.04999 15.825L10.25 18.325C10.85 18.525 11.45 18.625 12.05 18.625C12.65 18.625 13.25 18.525 13.85 18.325L20.05 15.825L21.35 16.325C22.35 16.725 22.35 18.125 21.25 18.525ZM13.05 16.425L21.25 13.125C22.25 12.725 22.25 11.325 21.25 10.925L13.05 7.62502C12.35 7.32502 11.65 7.32502 10.95 7.62502L2.75 10.925C1.75 11.325 1.75 12.725 2.75 13.125L10.95 16.425C11.65 16.725 12.45 16.725 13.05 16.425Z" fill="black" />
+																							<path d="M11.05 11.025L2.84998 7.725C1.84998 7.325 1.84998 5.925 2.84998 5.525L11.05 2.225C11.75 1.925 12.45 1.925 13.15 2.225L21.35 5.525C22.35 5.925 22.35 7.325 21.35 7.725L13.05 11.025C12.45 11.325 11.65 11.325 11.05 11.025Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">Napoleon Days</a>
+                                        <span class="text-muted fw-bold d-block fs-7">By Luke Owen</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">1:20PM, 02 Dec</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <div class="symbol symbol-50px me-2">
+																				<span class="symbol-label bg-light-danger">
+																					<!--begin::Svg Icon | path: icons/duotune/coding/cod002.svg-->
+																					<span class="svg-icon svg-icon-2x svg-icon-danger">
+																						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+																							<path opacity="0.3" d="M18 22C19.7 22 21 20.7 21 19C21 18.5 20.9 18.1 20.7 17.7L15.3 6.30005C15.1 5.90005 15 5.5 15 5C15 3.3 16.3 2 18 2H6C4.3 2 3 3.3 3 5C3 5.5 3.1 5.90005 3.3 6.30005L8.7 17.7C8.9 18.1 9 18.5 9 19C9 20.7 7.7 22 6 22H18Z" fill="black" />
+																							<path d="M18 2C19.7 2 21 3.3 21 5H9C9 3.3 7.7 2 6 2H18Z" fill="black" />
+																							<path d="M9 19C9 20.7 7.7 22 6 22C4.3 22 3 20.7 3 19H9Z" fill="black" />
+																						</svg>
+																					</span>
+                                                                                    <!--end::Svg Icon-->
+																				</span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">School Music Festival</a>
+                                        <span class="text-muted fw-bold d-block fs-7">by Rose Liam</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <span class="text-dark fw-bolder d-block fs-7">4:20PM, 03 Sep</span>
+                                        <span class="text-muted fw-bold d-block fs-8">Date</span>
+                                    </td>
+                                    <td class="text-end">
+                                        <a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                                            <i class="bi bi-three-dots fs-5"></i>
+                                        </a>
+                                    </td>
+                                </tr>
+                                </tbody>
+                                <!--end::Table body-->
+                            </table>
+                        </div>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+                </div>
+            </div>
+            <!--end::Body-->
+        </div>
+        <!--end::Tables Widget 8-->
+    </div>
+    <!--end::Col-->
+</div>
+<!--end::Row-->
+
+
+
+

www/application/views/users/view_yourpage.php

@@ -1,118 +1,145 @@
-<!-- Main content -->
+<!--begin::Row-->
-<div class="content-wrapper">
+<?php include('common/userstrip.php'); ?>
-    <?php include('common/userstrip.php'); ?>
+<div class="row g-5 g-xl-8">
-    <!-- Marketing campaigns -->
+    <div class="col-xl-12">
-    <div class="row">
+        <!--begin::Charts Widget 1-->
-        <div class="col-md-9">            
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
-            <div class="panel panel-flat">
+            <!--begin::Header-->
-                <div class="panel-heading"> 
+            <div class="card-header border-0 pt-5">
 
-                    <form method="POST" action="/member/yourpage" name='updatedescription'>
-                        <div class="form-group"> <b>Describe Yourself :</b></div>
-                        <div class="form-group">
-                            <textarea rows="3" cols="5" class="form-control" name='description' placeholder="Your best professional description" onkeydown="textCounter(this, this.form.remLen, 500);" onkeyup="textCounter(this, this.form.remLen, 500);"><?php echo $description; ?></textarea>                              
-                        </div>
 
-                        <div class="form-group"> 
+            </div>
-                            <div class="text-left">
+            <!--end::Header-->
-                                Characters left <input type="text" name="remLen" id="remLen" value="<?php echo 500 - strlen($description) ?>" style="border:none">
+            <!--begin::Body-->
+            <div class="card-body">
+                <div class="tab-content">
+
+
+                    <div class="row">
+                        <div class="col-md-9">
+                            <div class="panel panel-flat">
+                                <div class="panel-heading">
+
+                                    <form method="POST" action="/member/yourpage" name='updatedescription'>
+                                        <div class="form-group"> <b>Describe Yourself :</b></div>
+                                        <div class="form-group">
+                                            <textarea rows="3" cols="5" class="form-control" name='description' placeholder="Your best professional description" onkeydown="textCounter(this, this.form.remLen, 500);" onkeyup="textCounter(this, this.form.remLen, 500);"><?php echo $description; ?></textarea>
+                                        </div>
+
+                                        <div class="form-group">
+                                            <div class="text-left">
+                                                Characters left <input type="text" name="remLen" id="remLen" value="<?php echo 500 - strlen($description) ?>" style="border:none">
+                                            </div>
+                                            <div class="text-right">
+                                                <?=$update_message?>  <button type="submit" name='your_description' value='your_description' class="btn btn-primary btn-xs">Update </button>
+                                            </div>
+
+                                        </div>
+                                    </form>
+                                </div>
                             </div>
-                            <div class="text-right">
-                              <?=$update_message?>  <button type="submit" name='your_description' value='your_description' class="btn btn-primary btn-xs">Update </button>
-                            </div>                         
-
                         </div>
-                    </form>
-                </div>
-            </div>
-        </div>
 
-        <div class="col-md-3">            
+                        <div class="col-md-3">
-            <div class="panel panel-flat" style="text-align: center;">
+                            <div class="panel panel-flat" style="text-align: center;">
-               <img src="<? echo $_SESSION['profile_picture']; ?>" class="img-circle img-responsive" alt="">
+                                <img src="<? echo $_SESSION['profile_picture']; ?>" class="img-circle img-responsive" alt="">
-                <br><hr size="1">
+                                <br><hr size="1">
-                <a href="/member/picture" class="btn btn-outline-info btn-xs" >Change  Picture</a>
+                                <a href="/member/picture" class="btn btn-outline-info btn-xs" >Change  Picture</a>
 
-            </div>
+                            </div>
-        </div>
-    </div>
-
-
-    
-
-    <div class="row"> 
-        <div class="panel panel-flat">
-            <div class="panel-body">   
-                <div class="form-group">
-                    <b>your Online Gallery or Resume[Complete URL] </b>
-                </div>        
-
-                <form method="POST" action="#" id="galleryform" name='galleryform'>
-
-                    <div class="form-group"> 
-                        <div class="col-lg-2">
-                            []
-                        </div>
-                        <div class="col-lg-8">
-                            <input type="text" class="form-control" name='gallery' maxlength="150" value=''> 
-                        </div>
-                        <div class="col-lg-2">
-                            <div id="galmsg"></div> <button type="submit" id='gal' onclick="saveGallery('ADD',0);" class="btn btn-info btn-xs">Add </button>
                         </div>
                     </div>
-                </form>          
-
-           
-
-            </div>
-            
-            
-                        <div class="panel-body">   
-              
-                <div class="form-group">
-                   <?=$galery_list?>
-                </div>
-
-            </div>
-            
-        </div>
-    </div>
 
 
 
-    <div class="panel panel-flat" style="height: 510px;">
+                    <div class="row">
-        <div class="panel-body">   
+                        <div class="panel panel-flat">
+                            <div class="panel-body">
+                                <div class="form-group">
+                                    <b>your Online Gallery or Resume[Complete URL] </b>
+                                </div>
+
+                                <form method="POST" action="#" id="galleryform" name='galleryform'>
+
+                                    <div class="form-group">
+                                        <div class="col-lg-2">
+                                            []
+                                        </div>
+                                        <div class="col-lg-8">
+                                            <input type="text" class="form-control" name='gallery' maxlength="150" value=''>
+                                        </div>
+                                        <div class="col-lg-2">
+                                            <div id="galmsg"></div> <button type="submit" id='gal' onclick="saveGallery('ADD',0);" class="btn btn-info btn-xs">Add </button>
+                                        </div>
+                                    </div>
+                                </form>
 
 
-            <div class="col-md-5 col-md-offset-1" >
-                <form id="skillform" name="skillform" action="">
 
-                    <div class="form-group">     
+                            </div>
-                        <b>Skills :</b>                     
-                        <table style="width: 100%;" class="table-responsive" >
-                            <tr>
-                                <td><?php echo $skill_combo; ?></td>
-                                <td><?php echo $skill_types; ?></td>
-                                <td style="width: 50px;"><button id="add_skill" class="btn btn-info btn-xs">Add</button></td>
-                            </tr>
-                        </table>  
 
 
+                            <div class="panel-body">
+
+                                <div class="form-group">
+                                    <?=$galery_list?>
+                                </div>
+
+                            </div>
+
+                        </div>
                     </div>
 
-                </form>
-                <b>Your Selection(s)[Max 6]:</b>
-                <div id="save_skill_result" class="form-group"><?= $member_skills ?></div>  
-            </div>        
 
-            <div class="col-md-5 col-md-offset-1">
+
+                    <div class="panel panel-flat" style="height: 510px;">
+                        <div class="panel-body">
+
+
+                            <div class="col-md-5 col-md-offset-1" >
+                                <form id="skillform" name="skillform" action="">
+
+                                    <div class="form-group">
+                                        <b>Skills :</b>
+                                        <table style="width: 100%;" class="table-responsive" >
+                                            <tr>
+                                                <td><?php echo $skill_combo; ?></td>
+                                                <td><?php echo $skill_types; ?></td>
+                                                <td style="width: 50px;"><button id="add_skill" class="btn btn-info btn-xs">Add</button></td>
+                                            </tr>
+                                        </table>
+
+
+                                    </div>
+
+                                </form>
+                                <b>Your Selection(s)[Max 6]:</b>
+                                <div id="save_skill_result" class="form-group"><?= $member_skills ?></div>
+                            </div>
+
+                            <div class="col-md-5 col-md-offset-1">
+
+
+                            </div>
+                        </div>
+                    </div>
+
+
+
+                </div>
 
 
             </div>
+            <!--end::Body-->
         </div>
+        <!--end::Charts Widget 1-->
     </div>
 </div>
-<!-- /main content -->
+<!--end::Row-->
+
+
+
+
 <script type="text/javascript">
 <!--
     var skill_categories = {};

www/site3/assets/css/style.bundle.js

@@ -0,0 +1,43 @@
+/******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	// The require scope
+/******/ 	var __webpack_require__ = {};
+/******/ 	
+/************************************************************************/
+/******/ 	/* webpack/runtime/make namespace object */
+/******/ 	(() => {
+/******/ 		// define __esModule on exports
+/******/ 		__webpack_require__.r = (exports) => {
+/******/ 			if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 				Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 			}
+/******/ 			Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 		};
+/******/ 	})();
+/******/ 	
+/************************************************************************/
+var __webpack_exports__ = {};
+// This entry need to be wrapped in an IIFE because it need to be isolated against other entry modules.
+(() => {
+var __webpack_exports__ = {};
+/*!***************************************************************!*\
+  !*** ../../../themes/metronic/html/demo1/src/sass/style.scss ***!
+  \***************************************************************/
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+})();
+
+// This entry need to be wrapped in an IIFE because it need to be isolated against other entry modules.
+(() => {
+/*!*****************************************************************!*\
+  !*** ../../../themes/metronic/html/demo1/src/sass/plugins.scss ***!
+  \*****************************************************************/
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+})();
+
+/******/ })()
+;
+//# sourceMappingURL=style.bundle.js.map

www/site3/assets/css/style.bundle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"css/style.bundle.js","mappings":";;UAAA;UACA;;;;;WCDA;WACA;WACA;WACA,uDAAuD,iBAAiB;WACxE;WACA,gDAAgD,aAAa;WAC7D;;;;;;;;;;;;ACNA;;;;;;;;;;ACAA","sources":["webpack://keenthemes/webpack/bootstrap","webpack://keenthemes/webpack/runtime/make namespace object","webpack://keenthemes/../../../themes/metronic/html/demo1/src/sass/style.scss?7c24","webpack://keenthemes/../../../themes/metronic/html/demo1/src/sass/plugins.scss?1d77"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","// extracted by mini-css-extract-plugin\nexport {};","// extracted by mini-css-extract-plugin\nexport {};"],"names":[],"sourceRoot":""}

www/site3/assets/js/custom/home/general.js

@@ -0,0 +1 @@
+"use strict";var KTSigninGeneral=function(){var t,e,i;return{init:function(){t=document.querySelector("#kt_sign_in_form"),e=document.querySelector("#kt_sign_in_submit"),i=FormValidation.formValidation(t,{fields:{email:{validators:{notEmpty:{message:"Email address is required"},emailAddress:{message:"The value is not a valid email address"}}},password:{validators:{notEmpty:{message:"The password is required"}}}},plugins:{trigger:new FormValidation.plugins.Trigger,bootstrap:new FormValidation.plugins.Bootstrap5({rowSelector:".fv-row"})}}),e.addEventListener("click",(function(n){n.preventDefault(),i.validate().then((function(i){"Valid"==i?(e.setAttribute("data-kt-indicator","on"),e.disabled=!0,setTimeout((function(){e.removeAttribute("data-kt-indicator"),e.disabled=!1,Swal.fire({text:"You have successfully logged in!",icon:"success",buttonsStyling:!1,confirmButtonText:"Ok, got it!",customClass:{confirmButton:"btn btn-primary"}}).then((function(e){e.isConfirmed&&(t.querySelector('[name="email"]').value="",t.querySelector('[name="password"]').value="")}))}),2e3)):Swal.fire({text:"Error, your username, email and passowd is required, please try again.",icon:"error",buttonsStyling:!1,confirmButtonText:"Ok, got it!",customClass:{confirmButton:"btn btn-primary"}})}))}))}}}();KTUtil.onDOMContentLoaded((function(){KTSigninGeneral.init()}));

www/site3/assets/js/custom/signup/general.js

@@ -0,0 +1 @@
+"use strict";var KTSignupGeneral=function(){var e,t,a,s,r=function(){return 100===s.getScore()};return{init:function(){e=document.querySelector("#kt_sign_up_form"),t=document.querySelector("#kt_sign_up_submit"),s=KTPasswordMeter.getInstance(e.querySelector('[data-kt-password-meter="true"]')),a=FormValidation.formValidation(e,{fields:{"first-name":{validators:{notEmpty:{message:"First Name is required"}}},"last-name":{validators:{notEmpty:{message:"Last Name is required"}}},email:{validators:{notEmpty:{message:"Email address is required"},emailAddress:{message:"The value is not a valid email address"}}},password:{validators:{notEmpty:{message:"The password is required"},callback:{message:"Please enter valid password",callback:function(e){if(e.value.length>0)return r()}}}},"confirm-password":{validators:{notEmpty:{message:"The password confirmation is required"},identical:{compare:function(){return e.querySelector('[name="password"]').value},message:"The password and its confirm are not the same"}}},toc:{validators:{notEmpty:{message:"You must accept the terms and conditions"}}}},plugins:{trigger:new FormValidation.plugins.Trigger({event:{password:!1}}),bootstrap:new FormValidation.plugins.Bootstrap5({rowSelector:".fv-row",eleInvalidClass:"",eleValidClass:""})}}),t.addEventListener("click",(function(r){r.preventDefault(),a.revalidateField("password"),a.validate().then((function(a){"Valid"==a?(t.setAttribute("data-kt-indicator","on"),t.disabled=!0,setTimeout((function(){t.removeAttribute("data-kt-indicator"),t.disabled=!1,Swal.fire({text:"You have successfully reset your password!",icon:"success",buttonsStyling:!1,confirmButtonText:"Ok, got it!",customClass:{confirmButton:"btn btn-primary"}}).then((function(t){t.isConfirmed&&(e.reset(),s.reset())}))}),1500)):Swal.fire({text:"Sorry, looks like there are some errors detected, please try again.",icon:"error",buttonsStyling:!1,confirmButtonText:"Ok, got it!",customClass:{confirmButton:"btn btn-primary"}})}))})),e.querySelector('input[name="password"]').addEventListener("input",(function(){this.value.length>0&&a.updateFieldStatus("password","NotValidated")}))}}}();KTUtil.onDOMContentLoaded((function(){KTSignupGeneral.init()}));

www/site3/assets/media/svg/brand-logos/apple-black.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="2036" height="2500" viewBox="0 0 456.008 560.035"><path d="M380.844 297.529c.787 84.752 74.349 112.955 75.164 113.314-.622 1.988-11.754 40.191-38.756 79.652-23.343 34.117-47.568 68.107-85.731 68.811-37.499.691-49.557-22.236-92.429-22.236-42.859 0-56.256 21.533-91.753 22.928-36.837 1.395-64.889-36.891-88.424-70.883-48.093-69.53-84.846-196.475-35.496-282.165 24.516-42.554 68.328-69.501 115.882-70.192 36.173-.69 70.315 24.336 92.429 24.336 22.1 0 63.59-30.096 107.208-25.676 18.26.76 69.517 7.376 102.429 55.552-2.652 1.644-61.159 35.704-60.523 106.559M310.369 89.418C329.926 65.745 343.089 32.79 339.498 0 311.308 1.133 277.22 18.785 257 42.445c-18.121 20.952-33.991 54.487-29.709 86.628 31.421 2.431 63.52-15.967 83.078-39.655"/></svg>

www/site3/assets/media/svg/brand-logos/facebook-4.svg

@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.5 0H2.5C1.12125 0 0 1.12125 0 2.5V17.5C0 18.8787 1.12125 20 2.5 20H17.5C18.8787 20 20 18.8787 20 17.5V2.5C20 1.12125 18.8787 0 17.5 0Z" fill="#1976D2"/>
+<path d="M16.875 10H13.75V7.5C13.75 6.81 14.31 6.875 15 6.875H16.25V3.75H13.75C11.6788 3.75 10 5.42875 10 7.5V10H7.5V13.125H10V20H13.75V13.125H15.625L16.875 10Z" fill="#FAFAFA"/>
+</svg>

www/site3/assets/media/svg/brand-logos/google-icon.svg

@@ -0,0 +1,6 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M27.9851 14.2618C27.9851 13.1146 27.8899 12.2775 27.6837 11.4094H14.2788V16.5871H22.1472C21.9886 17.8738 21.132 19.8116 19.2283 21.1137L19.2016 21.287L23.44 24.4956L23.7336 24.5242C26.4304 22.0904 27.9851 18.5093 27.9851 14.2618Z" fill="#4285F4"/>
+<path d="M14.279 27.904C18.1338 27.904 21.37 26.6637 23.7338 24.5245L19.2285 21.114C18.0228 21.9356 16.4047 22.5092 14.279 22.5092C10.5034 22.5092 7.29894 20.0754 6.15663 16.7114L5.9892 16.7253L1.58205 20.0583L1.52441 20.2149C3.87224 24.7725 8.69486 27.904 14.279 27.904Z" fill="#34A853"/>
+<path d="M6.15656 16.7113C5.85516 15.8432 5.68072 14.913 5.68072 13.9519C5.68072 12.9907 5.85516 12.0606 6.14071 11.1925L6.13272 11.0076L1.67035 7.62109L1.52435 7.68896C0.556704 9.58024 0.00146484 11.7041 0.00146484 13.9519C0.00146484 16.1997 0.556704 18.3234 1.52435 20.2147L6.15656 16.7113Z" fill="#FBBC05"/>
+<path d="M14.279 5.3947C16.9599 5.3947 18.7683 6.52635 19.7995 7.47204L23.8289 3.6275C21.3542 1.37969 18.1338 0 14.279 0C8.69485 0 3.87223 3.1314 1.52441 7.68899L6.14077 11.1925C7.29893 7.82856 10.5034 5.3947 14.279 5.3947Z" fill="#EB4335"/>
+</svg>

www/svs/api/.htaccess

@@ -0,0 +1,22 @@
+<IfModule mod_rewrite.c>
+
+RewriteEngine On
+RewriteBase /svs/api/
+#RewriteBase /
+
+#Checks to
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^(.*)$ index.php?endpoint=$1 [L,NC,QSA]
+
+</IfModule>
+
+<IfModule !mod_rewrite.c>
+    # If we don't have mod_rewrite installed, all 404's
+    # can be sent to index.php, and everything works as normal.
+    # Submitted by: ElliotHaughin
+
+ErrorDocument 404 /index.php
+
+</IfModule>
+

www/svs/api/index.php

@@ -0,0 +1,2 @@
+<?php
+include 'index_backend.php';

www/svs/api/index_backend.php

@@ -0,0 +1,87 @@
+<?php
+include '../../backend.php';
+include 'constants.php';
+include 'formarter.php';
+
+$endpoints = array(
+    'apigate' => array('POST'),
+	'generics' => array('POST')
+);
+
+header("Access-Control-Allow-Origin: *");
+header("Access-Control-Expose-Headers: Access-Control-Allow-Origin");
+header("Access-Control-Allow-Headers: Cache-Control, Pragma, Origin, Authorization, Content-Type, X-Requested-With");
+header("Access-Control-Allow-Methods: POST, GET, PUT, DELETE, OPTIONS");
+header('Content-type: application/json');
+
+if ("OPTIONS" === $_SERVER['REQUEST_METHOD']) {
+    exit();
+}
+
+$endpoint = strtolower(str_replace('/svs/user/', '', strtok($_SERVER['REQUEST_URI'], '?')));
+
+$id = 0; // update, get & delete actions require ID
+if (substr($endpoint, 0, 19) == 'gettransportrequest' || substr($endpoint, 0, 13) == 'updateprofile') {
+    $endpoint = strtok($endpoint, '/');
+    $id = strtok('/');
+}
+
+if (!isset($endpoints[$endpoint])) {
+    header('HTTP/1.1 400 Bad Request');
+    header('Status: 400 Bad Request');
+    echo "{\"status\":\"Invalid endpoint url WRB\"}";
+    exit();
+}
+
+$methods = $endpoints[$endpoint];
+
+if (array_search($_SERVER['REQUEST_METHOD'], $methods) === false) {
+    header('HTTP/1.1 405 Method Not Allowed');
+    header('Status: 405 Method Not Allowed');
+    echo "{\"status\":\"Invalid request method\"}";
+    exit();
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    $in = flatten(json_decode(file_get_contents('php://input'), true));
+}
+if ($_SERVER["REQUEST_METHOD"] == "PUT") {
+    parse_str(file_get_contents('php://input'), $in);
+}
+if ($_SERVER["REQUEST_METHOD"] == "GET") {
+    $in = $_GET;
+}
+$in["loc"] = $_SERVER["REMOTE_ADDR"];
+switch ($endpoint) {
+	case 'generics':
+	case 'apigate':
+	//$in["action"] = WRENCHBOARD_ACCOUNT_LOGIN;
+	break;
+}
+
+
+
+$in["pid"] = 100;
+$out = array();
+$ret = $wrenchboard->wrenchboard_api($in, $out);
+$out['internal_return'] = $ret; // this is reserved array parameter - to be caprured and reoved before you use the out array()
+
+header("HTTP/1.1 200 OK");
+header("Status: 200 OK");
+//$out = array_merge($in, $out); // DEBUG
+echo json_encode(processOutJson($in, $out));
+exit();
+
+function flatten($data, $parentkey = "") {
+    $result = array();
+    foreach ($data as $key => $val) {
+        if (is_array($val)) {
+            $result = array_merge($result, flatten($val, $parentkey . $key . "_"));
+        } else {
+            $result[$parentkey . $key] = $val;
+        }
+    }
+    return $result;
+}
+
+

www/svs/user/userve.php

@@ -95,8 +95,10 @@ switch ($endpoint) {
 	//$in["action"] = WRENCHBOARD_ACCOUNT_LOGIN;
 	break;
     case 'startjoblist': $in["action"] = WRENCHBOARD_START_JOBLIST;
+		if (!array_key_exists("limit",$in)) $in["limit"] = 10;
+		if (!array_key_exists("page",$in))  $in["page"]  = 1;
         break;
-
+		
     case 'createmobileuser': $in["action"] = WRENCHBOARD_CREATE_MOBILEUSER;
         $in["loc"] = $_SERVER["REMOTE_ADDR"];
         $in["news"] = 0;