diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 08c610d5..92093426 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -187,7 +187,10 @@ $routes->post('api/(:any)', 'ApiIntegration::api_integration/$1'); $routes->get('get_country', 'Customer::get_country_list'); $routes->post('qucik_add_addresses', 'Customer::qucik_add_addresses'); - +#Payment Routes +$routes->match(['get','post'],'/subscription_renewal','Payment::index/'); +$routes->match(['get','post'],'/transaction','Payment::transaction/'); +$routes->match(['get','post'],'/subscription_renewal/(:any)','Payment::index/$1'); // $routes->group("api", function ($routes) { // // $routes->post("create_products/", "ApiIntegration::save_book_details"); diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index b91cb15e..634d2d15 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 !== '/auth_confirm_mail' && $requestedRoute !== '/auth_reset_password' && $requestedRoute !== 'auth_reset_password_save' && $uri->getSegment(1) != 'getExpCustomerDetail'&& $uri->getSegment(1) != 'download_invoice_pdf') { + if ($requestedRoute !== '/login' && $requestedRoute !== '/authenticate' && $requestedRoute !== '/auth_confirm_mail' && $requestedRoute !== '/auth_reset_password' && $requestedRoute !== 'auth_reset_password_save' && $requestedRoute !== '/subscription_renewal' && strpos($requestedRoute, '/subscription_renewal/') === false && $uri->getSegment(1) != 'getExpCustomerDetail'&& $uri->getSegment(1) != 'download_invoice_pdf') { $this->authData = $this->session_log(); } } diff --git a/app/Controllers/Notifications.php b/app/Controllers/Notifications.php index ea329d58..724ae0e3 100755 --- a/app/Controllers/Notifications.php +++ b/app/Controllers/Notifications.php @@ -622,7 +622,7 @@ class Notifications extends BaseController $emailContent = str_replace("{USER_NAME}", $fullName, $emailContent); $emailContent = str_replace("{SCHEME_NAME}", $schemename, $emailContent); $emailContent = str_replace("{EXPIRY_DATE}", $expirydate, $emailContent); - + $emailData = [ 'template_name' => 'EXPIRAY_NOTIFY_TEMPLATE_EMAIL', 'recipient_email' => $row['email'], diff --git a/app/Controllers/Payment.php b/app/Controllers/Payment.php new file mode 100644 index 00000000..1c4473e6 --- /dev/null +++ b/app/Controllers/Payment.php @@ -0,0 +1,60 @@ +get_customer_details_by_customer_id($subscriptionID); + $scheme = $model2->get_subscription_details_by_customerID($subscriptionID); + + $response = [ + 'customer_details' => $customer_details, + 'scheme' => $scheme, + 'subscriptionID' =>$subscriptionID + ]; + + return view('subscription_renewal',$response); + } + else{ + if ($this->request->getMethod() == 'get') { + + return view('subscription_renewal'); + } + else { + //echo "inside else";die(); + $customer_id = $this->request->getPost('customerID'); + $customer_details = $model->get_customer_details_by_customer_id($customer_id); + $scheme = $model2->get_subscription_details_by_customerID($customer_id); + + $response = [ + 'customer_details' => $customer_details, + 'scheme' => $scheme + ]; + //var_dump($response);die(); + return $this->response->setJSON($response); + } + } + + } + + public function transaction(){ + $price = $this->request->getPost('subscriptionPrice'); + $result = [ + 'price'=>$price + ]; + //var_dump($price);die(); + return view('transaction',$result); + } + + } + diff --git a/app/Models/CustomerModel.php b/app/Models/CustomerModel.php index 03080498..a38050ea 100755 --- a/app/Models/CustomerModel.php +++ b/app/Models/CustomerModel.php @@ -259,5 +259,16 @@ public function storeCustomerAddresses($billingAddress, $shippingAddress) return ["billing_addr_id"=>$billing_addr_id,"shipping_addr_id"=>$shipping_addr_id]; // Return true indicating successful insertion } +public function get_customer_details_by_customer_id($customer_id) +{ + $builder = $this->db->table('customers'); // Specify the main table + $builder->select('customers.customer_id, customers.mobile_no,customers.first_name, customers.last_name,customers.mobile_no,customer_addresses.address_1, customer_addresses.city, customer_addresses.state, customer_addresses.postal_code, customer_addresses.country',customer); + $builder->join('customer_addresses', 'customers.customer_id = customer_addresses.customer_address_id'); + $builder->where('customers.customer_id', $customer_id); + + $result = $builder->get()->getRowArray(); // Fetch the first matching record as an associative array + + return $result; +} } ?> \ No newline at end of file diff --git a/app/Models/SubscriptionModel.php b/app/Models/SubscriptionModel.php index c9da3139..03856096 100755 --- a/app/Models/SubscriptionModel.php +++ b/app/Models/SubscriptionModel.php @@ -338,7 +338,17 @@ public function getQueryforSubscriptionDetailsBySchemeName($flag,$condition, $va $query = $builder->get(); return $query->getResult(); } - + public function get_subscription_details_by_customerID($customerID) +{ + $builder = $this->db->table('subscription'); + $builder->select('subscription.from_subscription, subscription.to_subscription, subscription.scheme_id,books.price ,books.short_code'); + $builder->join('books', 'subscription.scheme_id = books.book_id', 'left'); + $builder->where('subscription.customer_id', $customerID); + $result = $builder->get()->getRowArray(); + + return $result; +} + diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php index 13815278..f235620a 100755 --- a/app/Views/dashboard.php +++ b/app/Views/dashboard.php @@ -162,17 +162,22 @@
- - + + + var lastNotification = ; + console.log(lastNotification); + + */ + ?> + diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php index e3d0dbf8..a1d72f34 100755 --- a/app/Views/invoice_form.php +++ b/app/Views/invoice_form.php @@ -82,6 +82,15 @@ input[type=number] { /* input[type="date"] { -moz-appearance: textfield; } */ + +.modal { + position: fixed; + top: 0; /* Adjust this value to move it further down */ + left: 50%; + transform: translateX(-50%); + z-index: 1050; /* Ensure it appears above other content */ +} +