WrenchBoard/WrenchBackOffice
2
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of ssh://gitlab.chiefsoft.net/WrenchBoard/WrenchBackOffice

Browse Source
This commit is contained in:
ChiefSoft works
2022-07-10 05:05:10 +00:00
parent 7d7c990821 0df701afb3
commit a90dcc7e9d
6 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/config.development.php
+1
View File
@@ -10,3 +10,4 @@ $arr["port"] = 5432;
define('LEGACY_BACKEND_ENDPOINT','http://backend.wrenchboard.api.test');
define('EXTENSTION_API_URL','https://oameye.work.wrenchboard.com/svs/bko');
application/config/config.production.php
+2 -1
View File
@@ -8,4 +8,5 @@ $arr["user"] = "wrenchboard";
$arr["pass"] = "wrenchboard";
$arr["port"] = 5432;
define('LEGACY_BACKEND_ENDPOINT','backend.wrenchboard.api.live');
define('LEGACY_BACKEND_ENDPOINT','backend.wrenchboard.api.live');
define('EXTENSTION_API_URL','https://dashboard.wrenchboard.com/svs/bko');
application/config/constants.php
+3
View File
@@ -218,6 +218,9 @@ define('WRENCHBOARD_SURVEY_DATA', 55000);
define('WRENCHBOARD_ADD_SURVEY', 55050);
define('WRENCHBOARD_LOAD_SURVEY', 55055);
define('WRENCHBOARD_COUPON_CREATE', 85010);
define('WRENCHBOARD_COUPON_ACTIVATE', 85015);
define('WRENCHBOARD_COMPLETE_SENDMONEY_INTERSW', 555);
define('WRENCHBOARD_GETBILLER_INTERSW', 556);
application/controllers/Bkosmember.php
+12 -1
View File
@@ -61,11 +61,22 @@ class Bkosmember extends Bkomember_Controller {
$couponArr = $q1->result_array();
$code = $couponArr[0]['code'];
$amount = $couponArr[0]['amount'];
$data['action'] = WRENCHBOARD_COUPON_ACTIVATE;
$data['member_id'] = $member_id;
$data['code'] = $code;
$data['amount'] = $amount;
// $data[''] = ;
$this->load->model('backend_model');
$out = array();
$res = $this->backend_model->wrenchboard_api($data, $out);
/*
$sql2 = "INSERT INTO coupons_allocation (member_id,code,amount,status) VALUES ( $member_id, '$code', $amount, ".COUPON_ACTIVE." ) ";
$this->db->query($sql2);
$sql0 = "UPDATE coupons SET active=now(), status=".COUPON_ALLOC_STARTED." WHERE code='".$code."'";
$this->db->query($sql0);
*/
echo "Assigned";
} else {
echo "Fail";
application/models/Backend_model.php
+4 -2
View File
@@ -20,8 +20,8 @@ class Backend_model extends CI_Model {
public function wrenchboard_api($in, &$out = array()) {
$ret = 0;
$local_url = 'http://fluxtra:fl0xtra!@oameye.works.wrenchboard.com/svs/user';
//$local_url = 'http://fluxtra:fl0xtra!@oameye.works.wrenchboard.com/svs/user';
$local_url = EXTENSTION_API_URL; // 'https://oameye.work.wrenchboard.com/svs/bko';
$url = $local_url ."/generics";
$data = $in;
@@ -48,6 +48,8 @@ class Backend_model extends CI_Model {
$out = $response;
// var_dump( $response );
//var_dump( $response["internal_return"] );
// exit;
return $response["internal_return"];
application/views/bko/common/bko_menu.php
+19 -28
View File
@@ -20,39 +20,30 @@
<a href="#"><i class="icon-stack2"></i> <span>Member</span></a>
<ul>
<li><a href="/bkouser/locate">Locate Member</a></li>
<?php
if ($_SESSION['bko_selected_memberd_id'] != '' and $_SESSION['bko_selected_memberd_id'] > 0) {
?>
<li><a href="/bkouser/memberdetail">Member[<?php echo $_SESSION['bko_selected_id']; ?>]</a>
<ul>
<li><a href="layout_navbar_main_hideable.html">Hideable main navbar</a></li>
<li><a href="layout_navbar_secondary_hideable.html">Hideable secondary navbar</a></li>
<li><a href="layout_sidebar_sticky_custom.html">Sticky sidebar (custom scroll)</a></li>
<li><a href="layout_sidebar_sticky_native.html">Sticky sidebar (native scroll)</a></li>
</ul>
</li>
<?php
}
?>
</ul>
</li>
<?
if ($_SESSION['bko_group'] == 1 ){
?>
<li>
<a href="#"><i class="icon-copy"></i> <span>Selected USER</span></a>
<ul>
<li><a href="/bkosmember/userdash" id="layout1">User Dash</a></li>
<li><a href="/bkosmember/usercoupon" id="coupon_user">User Coupons</a></li>
<li><a href="/bkosmember/mtransfer" id="layout1">Transfer</a></li>
<li><a href="/bkosmember/mpayments" id="layout2">Payments</a></li>
<li><a href="/bkosmember/mjobsdone" id="layout2">Jobs Performed</a></li>
<li><a href="/bkosmember/mjobposted" id="layout2">Jobs Posted</a></li>
</ul>
</li>
<?php
if ($_SESSION['bko_selected_memberd_id'] != '' and $_SESSION['bko_selected_memberd_id'] > 0) {
?>
<li>
<a href="#"><i class="icon-copy"></i> <span>Selected USER</span></a>
<ul>
<li><a href="/bkosmember/userdash" id="layout1">User Dash</a></li>
<li><a href="/bkosmember/usercoupon" id="coupon_user">User Coupons</a></li>
<li><a href="/bkosmember/mtransfer" id="layout1">Transfer</a></li>
<li><a href="/bkosmember/mpayments" id="layout2">Payments</a></li>
<li><a href="/bkosmember/mjobsdone" id="layout2">Jobs Performed</a></li>
<li><a href="/bkosmember/mjobposted" id="layout2">Jobs Posted</a></li>
</ul>
</li>
<?php
}
?>
<!-- /main -->
<!-- Forms -->