diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 808d7a6f..978eeb03 100755 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -65,7 +65,7 @@ abstract class BaseController extends Controller echo "This is a command-line request."; // echo $requestedRoute; } else { - if ($requestedRoute !== '/login' && $requestedRoute !== '/authenticate'&& $requestedRoute !== '/pay' && $requestedRoute !== '/auth_confirm_mail' && $requestedRoute !== '/auth_reset_password' && $requestedRoute !== 'auth_reset_password_save' && $requestedRoute !== '/subscription_renewal'&& $requestedRoute !== '/tresponse' && strpos($requestedRoute, '/subscription_renewal/') === false && $requestedRoute !== '/payment_failure'&& $requestedRoute !== '/payment_success' && $uri->getSegment(1) != 'getExpCustomerDetail'&& $uri->getSegment(1) != 'download_invoice_pdf') { + if ($requestedRoute !== '/login' && $requestedRoute !== '/authenticate'&& $requestedRoute !== '/pay' && $requestedRoute !== '/auth_confirm_mail' && $requestedRoute !== '/auth_reset_password' && $requestedRoute !== 'auth_reset_password_save' && $requestedRoute !== '/subscription_renewal'&& $requestedRoute !== '/tresponse' && strpos($requestedRoute, '/subscription_renewal/') === false && $requestedRoute !== '/payment_failure'&& $requestedRoute !== '/payment_success' && $requestedRoute !== '/payment_process' && $uri->getSegment(1) != 'getExpCustomerDetail'&& $uri->getSegment(1) != 'download_invoice_pdf') { $this->authData = $this->session_log(); } } diff --git a/app/Controllers/Payment.php b/app/Controllers/Payment.php index 6e54973a..f1412ed7 100644 --- a/app/Controllers/Payment.php +++ b/app/Controllers/Payment.php @@ -7,7 +7,7 @@ use App\Models\CustomerModel; use App\Models\InvoiceModel; use App\Models\TransactionModel; use App\Models\SubscriptionModel; - +use App\Models\AuthenticationModel; require_once('vendor/autoload.php'); define('PROJECT', 'vendor/paytm/paytm-pg'); @@ -21,9 +21,15 @@ class Payment extends BaseController public function index($membership_id = null) { + helper('session'); $model = new CustomerModel(); $model2 = new SubscriptionModel(); $bookModel = new BooksModel(); + $session_uid = get_logged_user_id(); + $auth_model = new AuthenticationModel(); + $details = $auth_model->getheringDetailsForHeader($session_uid); + $response['favicon'] = !empty($details[0]['favicon']) && file_exists(FCPATH."public/uploads/".$details[0]['favicon']) ? base_url("public/uploads/".$details[0]['favicon']) : base_url("public/uploads/default.ico"); + if ($membership_id != null){ @@ -42,13 +48,15 @@ class Payment extends BaseController 'CustomerID' =>$customer_id, 'amount' =>$amount ]; - //var_dump($response);die(); + $response['favicon'] = !empty($details[0]['favicon']) && file_exists(FCPATH."public/uploads/".$details[0]['favicon']) ? base_url("public/uploads/".$details[0]['favicon']) : base_url("public/uploads/default.ico"); + + // var_dump($response);die(); return view('subscription_renewal',$response); } else{ if ($this->request->getMethod() == 'get') { - return view('subscription_renewal'); + return view('subscription_renewal',$response); } else { //echo "inside else";die(); diff --git a/app/Views/subscription_renewal.php b/app/Views/subscription_renewal.php index da0b9aaf..ecaede96 100644 --- a/app/Views/subscription_renewal.php +++ b/app/Views/subscription_renewal.php @@ -6,6 +6,8 @@ Subscription Renewal + +