From 0df701afb398c439870a9782517f6ed084fd38a8 Mon Sep 17 00:00:00 2001 From: dev-chiefworks Date: Wed, 6 Jul 2022 21:11:49 -0400 Subject: [PATCH] Clean upmenu --- application/config/config.development.php | 1 + application/config/config.production.php | 3 +- application/config/constants.php | 3 ++ application/controllers/Bkosmember.php | 13 ++++++- application/models/Backend_model.php | 6 ++- application/views/bko/common/bko_menu.php | 47 +++++++++-------------- 6 files changed, 41 insertions(+), 32 deletions(-) diff --git a/application/config/config.development.php b/application/config/config.development.php index db54e9b..3639729 100644 --- a/application/config/config.development.php +++ b/application/config/config.development.php @@ -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'); diff --git a/application/config/config.production.php b/application/config/config.production.php index f1b057b..6bb240c 100644 --- a/application/config/config.production.php +++ b/application/config/config.production.php @@ -8,4 +8,5 @@ $arr["user"] = "wrenchboard"; $arr["pass"] = "wrenchboard"; $arr["port"] = 5432; -define('LEGACY_BACKEND_ENDPOINT','backend.wrenchboard.api.live'); \ No newline at end of file +define('LEGACY_BACKEND_ENDPOINT','backend.wrenchboard.api.live'); +define('EXTENSTION_API_URL','https://dashboard.wrenchboard.com/svs/bko'); \ No newline at end of file diff --git a/application/config/constants.php b/application/config/constants.php index 527b5a1..9bca3fc 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -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); diff --git a/application/controllers/Bkosmember.php b/application/controllers/Bkosmember.php index dbb39be..4f0b728 100644 --- a/application/controllers/Bkosmember.php +++ b/application/controllers/Bkosmember.php @@ -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"; diff --git a/application/models/Backend_model.php b/application/models/Backend_model.php index 69ecc6b..892ec61 100644 --- a/application/models/Backend_model.php +++ b/application/models/Backend_model.php @@ -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"]; diff --git a/application/views/bko/common/bko_menu.php b/application/views/bko/common/bko_menu.php index 550a2f1..50e546e 100644 --- a/application/views/bko/common/bko_menu.php +++ b/application/views/bko/common/bko_menu.php @@ -20,39 +20,30 @@ Member -
  • - Selected USER - -
    • - + + + 0) { + ?> +
  • + Selected USER + +
    • +