WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-03-07 14:00:31 -05:00
parent f64576f3e8
commit b0747071e9
10 changed files with 95 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/config/constants.php
+1
View File
@@ -172,6 +172,7 @@ define('WRENCHBOARD_SAVE_GALLERY', 11042);
define('WRENCHBOARD_USER_ADNEWCC', 11054);
define('WRENCHBOARD_USER_USESAVEDCC', 11056);
define('WRENCHBOARD_USER_DELETEACC', 11990);
define('WRENCHBOARD_ACCOUNT_END', 11999);
//**************************************************************
define('WRENCHBOARD_JOB_CREATEJOB',13010 );
www/application/controllers/Login.php
+4 -2
View File
@@ -177,8 +177,10 @@ class Login extends WRB_Controller {
public function refreshAccountDetail($member_id) {
$this->load->model('account_model');
$qr = $this->account_model->loadAccountData($member_id);
// print_r($qr);
$_SESSION['current_balance'] = $qr[0]['balance'];
$this->load->model('account_model');
$_SESSION['current_balance'] = $this->account_model->getUserWallet($member_id,$currency='NAIRA'); // $out['current_balance'];
// $_SESSION['current_balance'] = $qr[0]['balance'];
$_SESSION['active_task'] = $this->account_model->loadActiveTaskCount($member_id);
}
www/application/controllers/Member.php
+30 -30
View File
@@ -26,10 +26,24 @@ class Member extends Users_Controller {
}
}
/*
* Schedule account delete in the backend
*/
public function deleteacc(){
echo "Please log out of your account, and you will not be able to log in anymore. ";
// echo "Please log out of your account, and you will not be able to log in anymore. ";
$data = $this->getSessionArray();
$in = [];
$in['member_id'] = $_SESSION['member_id'];
$in['reason'] = "Not accepted in this version";
$in['action'] = WRENCHBOARD_USER_DELETEACC;
if ($this->wrenchboard_api($in, $outx) == PHP_API_OK) {
$data['delete_message'] = "<div class=\"text-left\"><div class=\"alert alert-info no-border\">Your Account and Information Deleted.</div></div>";
redirect('/logout');
} else {
$data['delete_message'] = "<div class=\"text-left\"><div class=\"alert alert-danger no-border\">Unable to complete account delete at this time. </div></div>";
}
echo $data['delete_message'];
}
public function addreccipient() {
@@ -702,11 +716,9 @@ class Member extends Users_Controller {
public function smoney() {
$data = $this->getSessionArray();
//var_dump($data);
//exit();
$data['add_error'] = '';
$data['amount'] = 0;
@@ -717,6 +729,9 @@ class Member extends Users_Controller {
$data['comment'] = '';
// $data['fee'] = 0;
//$data['escrow_balance'] = 0;
$this->load->model('account_model');
$data['wallet'] = $this->account_model->getUserWallet($_SESSION['member_id'],$currency='NAIRA'); // $out['current_balance'];
$data['current_balance'] = $data['wallet'][0]['current_balance'];
if ($_POST) {
$data['comment'] = $this->input->post('comment');
@@ -739,7 +754,7 @@ class Member extends Users_Controller {
$TotalAmount = $data['total'];
// now let us do initial check if you have enough money
if ($_SESSION['current_balance'] < $TotalAmount) {
if ($data['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 {
@@ -765,6 +780,9 @@ class Member extends Users_Controller {
$data['sendmoney_table'] = $this->table->generate($query);
$data['sendmoney_table_result'] = $query->result();
$data['page_title'] ="Wallet";
$this->RenderUserPage('users/view_smoney', $data);
}
@@ -793,19 +811,7 @@ class Member extends Users_Controller {
$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["senderid"] = $_SESSION['member_id'];
@@ -830,13 +836,13 @@ class Member extends Users_Controller {
$out = array();
$res = $this->backend_model->wrenchboard_api($data, $out);
// print_r($out);
//exit;
exit;
$data = $this->getSessionArray(); // you will need this for new balace
$data["fee"] = $out["Fee"];
$data["amount"] = $out["InitiatingAmount"];
$data["total"] = $data["fee"] + $data["amount"];
$data["recipient_account_detail"] = "Recipient Account Here";
$data["comment"] = "Coment Here";
$data["comment"] = "Comment Here";
$data["rec_firstname"] = $out["firstname"];
$data["rec_lastname"] = $out["lastname"];
@@ -879,17 +885,11 @@ class Member extends Users_Controller {
$this->load->model('combo_model');
$this->combo_model->setReadOnly(true);
$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);
$this->RenderUserPage('users/view_confirmwithdraw', $data);
} else {
$data['sendmoney_table_result'] = $this->getSendMoneyRecent();
$this->RenderUserPage('users/view_finalwithdraw', $data);
}
}
www/application/controllers/Paymnt.php
+3
View File
@@ -99,6 +99,9 @@ class Paymnt extends Users_Controller {
public function cardreciepts(){
$data = array_merge($this->getSessionArray(), $this->session->flashdata('reciept_data'));
if (!isset($data['confirmation'])){
redirect("dash");
}
$this->RenderUserPage('users/view_payreciepts', $data); // return back to card page
}
}
www/application/core/WRB_Controller.php
+7 -2
View File
@@ -74,17 +74,22 @@ class WRB_Controller extends CI_Controller {
$out = $this->dash_model->getDashData($data);
$data['active_task'] = $out['active_task'];
$data['active_pass_due'] = $out['active_pass_due'];
$data['current_balance'] = $out['current_balance'];
$data['new_message'] = $out['new_message'];
$_SESSION["active_offers_count"] = $out['active_offers_count'];
$data = $_SESSION['secure_data'];
$this->load->model('account_model');
$data['wallet'] = $this->account_model->getUserWallet($_SESSION['member_id'],$currency='NAIRA'); // $out['current_balance'];
$data['current_balance'] = $data['wallet'][0]['current_balance'];
$data = $_SESSION['secure_data'];
$data['member_id'] = $_SESSION['member_id']; // = $ret->email;
$this->refreshAccountDetail($_SESSION['member_id']);
return $data;
}
protected function logUser($mlog) {
//
$data['action'] = WRENCHBOARD_LOG_MEMBER;
www/application/libraries/Users_Controller.php
+11 -2
View File
@@ -39,11 +39,15 @@ class Users_Controller extends WRB_Controller {
$out = $this->dash_model->getDashData($data);
$data['active_task'] = $out['active_task'];
$data['active_pass_due'] = $out['active_pass_due'];
$data['current_balance'] = $out['current_balance'];
//$data['current_balance'] = $out['current_balance'];
$data['new_message'] = $out['new_message'];
$data['escrow_balance'] = $out['escrow_balance'];
$data['description'] = $out["description"];
$this->load->model('account_model');
$data['wallet'] = $this->account_model->getUserWallet($_SESSION['member_id'],$currency='NAIRA'); // $out['current_balance'];
$data['current_balance'] = $data['wallet'][0]['current_balance'];
//$data = $_SESSION['secure_data'];
$data['member_id'] = $_SESSION['member_id']; // = $ret->email;
$_SESSION["active_offers_count"] = $out['active_offers_count'];
@@ -58,7 +62,12 @@ class Users_Controller extends WRB_Controller {
$this->load->model('account_model');
$qr = $this->account_model->loadAccountData($member_id);
// print_r($qr);
$_SESSION['current_balance'] = $qr[0]['balance'];
// $_SESSION['current_balance'] = $qr[0]['balance'];
$this->load->model('account_model');
$data['wallet'] = $this->account_model->getUserWallet($member_id,$currency='NAIRA'); // $out['current_balance'];
$_SESSION['current_balance'] = $data['wallet'][0]['current_balance'];
$_SESSION['active_task'] = $this->account_model->loadActiveTaskCount($member_id);
$_SESSION['state'] = $qr[0]['state'];
$_SESSION['city'] = $qr[0]['city'];
www/application/models/Account_model.php
+5 -1
View File
@@ -9,7 +9,11 @@ class Account_model extends CI_Model {
public function getUserWallet($member_id,$currency='') {
$num = 0;
//$mysql = "SELECT * FROM members_wallet WHERE member_id = $member_id AND currency='".$currency."' ";
$mysql = "SELECT w.amount,c.* FROM members_wallet w LEFT JOIN currency c ON c.code=w.currency WHERE w.member_id = $member_id ORDER BY c.lorder DESC";
$and_part = '';
if ($currency =''){
$and_part = " AND w.currency='$currency' ";
}
$mysql = "SELECT w.amount,c.*,w.amount AS current_balance FROM members_wallet w LEFT JOIN currency c ON c.code=w.currency WHERE w.member_id = $member_id ".$and_part." ORDER BY c.lorder DESC";
$query = $this->db->query($mysql);
return $query->result_array();
}
www/application/models/Backend_model.php
+5
View File
@@ -20,6 +20,11 @@ class Backend_model extends CI_Model {
public function wrenchboard_api($in, $out = array()) {
$this->wrenchboard_load();
$ret = $this->wrenchboard->wrenchboard_api($in, $out);
// var_dump($ret);
// echo "-----";
// var_dump($out);
// exit();
return $ret;
}
www/application/models/Dash_model.php
+1
View File
@@ -54,6 +54,7 @@ class Dash_model extends CI_Model {
return $out;
}
public function getNewMessageCount($member_id) {
$out = array();
$out['new_message'] =0;
www/application/views/users/view_settings.php
+28 -248
View File
@@ -51,250 +51,32 @@ $email_preff = array (
<div id="kt_account_settings_email_preferences" class="collapse show">
<!--begin::Form-->
<form class="form">
<?php
foreach ($email_preff as $rw){
?>
<?php
}
?>
<!--begin::Card body-->
<div class="card-body border-top px-9 py-9">
<!--begin::Option-->
<label class="form-check form-check-custom form-check-solid align-items-start">
<!--begin::Input-->
<input class="form-check-input me-3" type="checkbox" name="email-preferences[]" value="1" />
<!--end::Input-->
<!--begin::Label-->
<span class="form-check-label d-flex flex-column align-items-start">
<span class="fw-bolder fs-5 mb-0">Successful Payments</span>
<span class="text-muted fs-6">Receive a notification for every successful payment.</span>
</span>
<!--end::Label-->
</label>
<!--end::Option-->
<!--begin::Option-->
<div class="separator separator-dashed my-6"></div>
<!--end::Option-->
<!--begin::Option-->
<label class="form-check form-check-custom form-check-solid align-items-start">
<!--begin::Input-->
<input class="form-check-input me-3" type="checkbox" name="email-preferences[]" checked="checked" value="1" />
<!--end::Input-->
<!--begin::Label-->
<span class="form-check-label d-flex flex-column align-items-start">
<span class="fw-bolder fs-5 mb-0">Payouts</span>
<span class="text-muted fs-6">Receive a notification for every initiated payout.</span>
</span>
<!--end::Label-->
</label>
<!--end::Option-->
<!--begin::Option-->
<div class="separator separator-dashed my-6"></div>
<!--end::Option-->
<!--begin::Option-->
<label class="form-check form-check-custom form-check-solid align-items-start">
<!--begin::Input-->
<input class="form-check-input me-3" type="checkbox" name="email-preferences[]" value="1" />
<!--end::Input-->
<!--begin::Label-->
<span class="form-check-label d-flex flex-column align-items-start">
<span class="fw-bolder fs-5 mb-0">Fee Collection</span>
<span class="text-muted fs-6">Receive a notification each time you collect a fee from sales</span>
</span>
<!--end::Label-->
</label>
<!--end::Option-->
<!--begin::Option-->
<div class="separator separator-dashed my-6"></div>
<!--end::Option-->
<!--begin::Option-->
<label class="form-check form-check-custom form-check-solid align-items-start">
<!--begin::Input-->
<input class="form-check-input me-3" type="checkbox" name="email-preferences[]" checked="checked" value="1" />
<!--end::Input-->
<!--begin::Label-->
<span class="form-check-label d-flex flex-column align-items-start">
<span class="fw-bolder fs-5 mb-0">Customer Payment Dispute</span>
<span class="text-muted fs-6">Receive a notification if a payment is disputed by a customer and for dispute purposes.</span>
</span>
<!--end::Label-->
</label>
<!--end::Option-->
<!--begin::Option-->
<div class="separator separator-dashed my-6"></div>
<!--end::Option-->
<!--begin::Option-->
<label class="form-check form-check-custom form-check-solid align-items-start">
<!--begin::Input-->
<input class="form-check-input me-3" type="checkbox" name="email-preferences[]" value="1" />
<!--end::Input-->
<!--begin::Label-->
<span class="form-check-label d-flex flex-column align-items-start">
<span class="fw-bolder fs-5 mb-0">Refund Alerts</span>
<span class="text-muted fs-6">Receive a notification if a payment is stated as risk by the Finance Department.</span>
</span>
<!--end::Label-->
</label>
<!--end::Option-->
<!--begin::Option-->
<div class="separator separator-dashed my-6"></div>
<!--end::Option-->
<!--begin::Option-->
<label class="form-check form-check-custom form-check-solid align-items-start">
<!--begin::Input-->
<input class="form-check-input me-3" type="checkbox" name="email-preferences[]" checked="checked" value="1" />
<!--end::Input-->
<!--begin::Label-->
<span class="form-check-label d-flex flex-column align-items-start">
<span class="fw-bolder fs-5 mb-0">Invoice Payments</span>
<span class="text-muted fs-6">Receive a notification if a customer sends an incorrect amount to pay their invoice.</span>
</span>
<!--end::Label-->
</label>
<!--end::Option-->
<!--begin::Option-->
<div class="separator separator-dashed my-6"></div>
<!--end::Option-->
<!--begin::Option-->
<label class="form-check form-check-custom form-check-solid align-items-start">
<!--begin::Input-->
<input class="form-check-input me-3" type="checkbox" name="email-preferences[]" value="1" />
<!--end::Input-->
<!--begin::Label-->
<span class="form-check-label d-flex flex-column align-items-start">
<span class="fw-bolder fs-5 mb-0">Webhook API Endpoints</span>
<span class="text-muted fs-6">Receive notifications for consistently failing webhook API endpoints.</span>
</span>
<!--end::Label-->
</label>
<!--end::Option-->
</div>
<!--end::Card body-->
<!--begin::Card footer-->
<div class="card-footer d-flex justify-content-end py-6 px-9">
<button class="btn btn-primary px-6">Save Changes</button>
</div>
<!--end::Card footer-->
</form>
<!--end::Form-->
</div>
<!--end::Content-->
</div>
<!--end::Notifications-->
<!--begin::Notifications-->
<div class="card mb-5 mb-xl-10">
<!--begin::Card header-->
<div class="card-header border-0 cursor-pointer" role="button" data-bs-toggle="collapse" data-bs-target="#kt_account_notifications" aria-expanded="true" aria-controls="kt_account_notifications">
<div class="card-title m-0">
<h3 class="fw-bolder m-0">Notifications</h3>
</div>
</div>
<!--begin::Card header-->
<!--begin::Content-->
<div id="kt_account_settings_notifications" class="collapse show">
<!--begin::Form-->
<form class="form">
<!--begin::Card body-->
<div class="card-body border-top px-9 pt-3 pb-4">
<!--begin::Table-->
<div class="table-responsive">
<table class="table table-row-dashed border-gray-300 align-middle gy-6">
<tbody class="fs-6 fw-bold">
<!--begin::Table row-->
<tr>
<td class="min-w-250px fs-4 fw-bolder">Notifications</td>
<td class="w-125px">
<div class="form-check form-check-solid">
<input class="form-check-input" type="checkbox" value="" id="kt_settings_notification_email" checked="checked" data-kt-check="true" data-kt-check-target="[data-kt-settings-notification=email]" />
<label class="form-check-label ps-2" for="kt_settings_notification_email">Email</label>
</div>
</td>
<td class="w-125px">
<div class="form-check form-check-solid">
<input class="form-check-input" type="checkbox" value="" id="kt_settings_notification_phone" checked="checked" data-kt-check="true" data-kt-check-target="[data-kt-settings-notification=phone]" />
<label class="form-check-label ps-2" for="kt_settings_notification_phone">Text</label>
</div>
</td>
</tr>
<!--begin::Table row-->
<!--begin::Table row-->
<tr>
<td>Billing Updates</td>
<td>
<div class="form-check form-check-solid">
<input class="form-check-input" type="checkbox" value="1" id="billing1" checked="checked" data-kt-settings-notification="email" />
<label class="form-check-label ps-2" for="billing1"></label>
</div>
</td>
<td>
<div class="form-check form-check-solid">
<input class="form-check-input" type="checkbox" value="" id="billing2" checked="checked" data-kt-settings-notification="phone" />
<label class="form-check-label ps-2" for="billing2"></label>
</div>
</td>
</tr>
<!--begin::Table row-->
<!--begin::Table row-->
<tr>
<td>New Team Members</td>
<td>
<div class="form-check form-check-solid">
<input class="form-check-input" type="checkbox" value="" id="team1" checked="checked" data-kt-settings-notification="email" />
<label class="form-check-label ps-2" for="team1"></label>
</div>
</td>
<td>
<div class="form-check form-check-solid">
<input class="form-check-input" type="checkbox" value="" id="team2" data-kt-settings-notification="phone" />
<label class="form-check-label ps-2" for="team2"></label>
</div>
</td>
</tr>
<!--begin::Table row-->
<!--begin::Table row-->
<tr>
<td>Completed Projects</td>
<td>
<div class="form-check form-check-solid">
<input class="form-check-input" type="checkbox" value="" id="project1" data-kt-settings-notification="email" />
<label class="form-check-label ps-2" for="project1"></label>
</div>
</td>
<td>
<div class="form-check form-check-solid">
<input class="form-check-input" type="checkbox" value="" id="project2" checked="checked" data-kt-settings-notification="phone" />
<label class="form-check-label ps-2" for="project2"></label>
</div>
</td>
</tr>
<!--begin::Table row-->
<!--begin::Table row-->
<tr>
<td class="border-bottom-0">Newsletters</td>
<td class="border-bottom-0">
<div class="form-check form-check-solid">
<input class="form-check-input" type="checkbox" value="" id="newsletter1" data-kt-settings-notification="email" />
<label class="form-check-label ps-2" for="newsletter1"></label>
</div>
</td>
<td class="border-bottom-0">
<div class="form-check form-check-solid">
<input class="form-check-input" type="checkbox" value="" id="newsletter2" data-kt-settings-notification="phone" />
<label class="form-check-label ps-2" for="newsletter2"></label>
</div>
</td>
</tr>
<!--begin::Table row-->
</tbody>
</table>
</div>
<!--end::Table-->
<?php
foreach ($email_preff as $rw){
?>
<!--begin::Option-->
<label class="form-check form-check-custom form-check-solid align-items-start">
<!--begin::Input-->
<input class="form-check-input me-3" type="checkbox" name="email-preferences[]" value="1" />
<!--end::Input-->
<!--begin::Label-->
<span class="form-check-label d-flex flex-column align-items-start">
<span class="fw-bolder fs-5 mb-0"><?=$rw['title']?></span>
<span class="text-muted fs-6"><?=$rw['desc']?></span>
</span>
<!--end::Label-->
</label>
<!--end::Option-->
<!--begin::Option-->
<div class="separator separator-dashed my-6"></div>
<!--end::Option-->
<?php
}
?>
</div>
<!--end::Card body-->
<!--begin::Card footer-->
@@ -308,6 +90,7 @@ $email_preff = array (
<!--end::Content-->
</div>
<!--end::Notifications-->
<!--begin::Deactivate Account-->
<div class="card">
<!--begin::Card header-->
@@ -373,14 +156,14 @@ $email_preff = array (
<script type="text/javascript">
<!--
function deactivateMyAccount() {
var deactivate = document.dact_individual.deactivate.value;
if (deactivate == '') {
// var deactivate = document.dact_individual.deactivate.value;
var deactivate = document.getElementById("deactivate").checked;
// alert("deactivate --- " + deactivate);
if (deactivate != true) {
alert('You must confirm my account deactivation');
//return false;
return false;
}
var dialog = confirm("Please confirm account deletion. We will not be able to reverse this action. ?");
if (dialog) {
//console.log('Continue')
@@ -388,14 +171,11 @@ $email_preff = array (
else {
return true;
}
$.ajax({
url: "/member/deleteacc?contact_id=DELETE"
}).done(function (data) {
$('#del-sec').html(data);
});
return false;
}
// -->