diff --git a/app/Config/Constants.php b/app/Config/Constants.php
index 970e679..5c01703 100644
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -94,37 +94,8 @@ define('EVENT_PRIORITY_NORMAL', 100);
define('EVENT_PRIORITY_HIGH', 10);
/**
- * Constants For Api Integration.
+ * Constants For BBD
*/
-// define('VB_APIURL', 'https://vbp.venbait.in/wp-json/wc/v3/');
-define('product','books');
-define('product_column', ["book_id","wp_api_product_id"]);
-
-define('product_child','book_images');
-define('product_child_column', ["book_id","wp_api_img_id","book_img_id"]);
-
-define('customer','customers');
-define('customer_column', ["customer_id","wp_api_customer_id"]);
-
-define('customer_child','customer_addresses');
-define('customer_child_column', ["customer_id","","customer_address_id"]);
-
-define('order','invoice');
-define('order_column', ["invoice_id","wp_api_order_id","invoice_child_id"]);
-
-define('order_child','invoiceitems');
-define('order_child_column', ["invoice_id","wp_api_line_items_id","customer_id"]);
-
-// define('WAAI_TOKEN', '652548474f4e4');
-// define('WAAI_INSTANCE', '65254894E4A88');
-
-// UAT - for testing Purpose..
-// define('WAAI_TOKEN', '65685e954bcf6');
-// define('WAAI_INSTANCE', '656863C54F90C');
-
-// LIVE - Vel given.30th Nov.
-// define('WAAI_TOKEN', '6568739969f28');
-// define('WAAI_INSTANCE', '656876690A9FD');
define('SEND_WAAI_URL', 'https://waai.in/api/send');
define('SEND_WAAI_GROUP_URL', 'https://waai.in/api/send_group');
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index bbd0300..373c069 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -29,6 +29,7 @@ $routes->set404Override();
// We get a performance increase by specifying the default
// route since we don't have to scan directories.
+// In your routes file (e.g., app/Config/Routes.php)
# Authentication Routes
$routes->get('/', 'Authentication::index');
@@ -41,78 +42,56 @@ $routes->post('auth_reset_password_save/', 'Authentication::auth_reset_password_
$routes->get('lockscreen/', 'Authentication::lockscreen');
$routes->get('lock/', 'Authentication::lock');
$routes->post('unlock/', 'Authentication::unlock');
-
-
+$routes->post('confirm_password/', 'Authentication::confirm_password');
+$routes->post('change_password', 'Authentication::change_password');
# Dashboard Routes
$routes->get('dashboard/', 'Home::index');
+$routes->post("check_existing/", "Home::check_existing/");
# Users Routes
$routes->get("user_list/", "Users::index");
$routes->get("user_page/(:any)/(:any)", "Users::user_page/$1/$2");
$routes->post("insert_users", "Users::insert_users");
$routes->get("delete_user/(:any)", "Users::delete_user/$1");
-$routes->get("activateUser/(:any)", "Users::activateUser/$1");
+$routes->get("activate_user/(:any)", "Users::activate_user/$1");
$routes->get('users/get_branches/(:num)', 'Users::get_branches/$1');
-
# Causes Routes
$routes->get("causes_list/", "Books::index");
$routes->get("add_causes/(:any)", "Books::add_causes/$1");
-$routes->post("insert_books", "Books::insert_books");
-$routes->get("delete_books/(:any)", "Books::delete_books/$1");
+$routes->post("insert_causes", "Books::insert_causes");
+$routes->get("delete_causes/(:any)", "Books::delete_causes/$1");
-# Site-Setting Routes
-$routes->get("sitesetting_list/", "Settings::index");
-$routes->get("sitesetting_page/(:any)", "Settings::sitesetting_page/$1");
-$routes->post("sitesetting_synchronization", "Settings::sitesetting_synchronization");
-$routes->get("delete_sitesetting/(:any)", "Books::delete_sitesetting/$1");
-
-# App Site-Setting Routes(SuperAdmin)
-// $routes->get("appsetting/", "AppSettings::index");
-$routes->get("appsetting_page", "AppSettings::appsetting_page");
-$routes->post("appsetting_synchronization", "AppSettings::appsetting_synchronization");
-// $routes->get("delete_sitesetting/(:any)", "Books::delete_sitesetting/$1");
-
-#Routes for Organization Routes
+#Organization Routes (also known as business)
$routes->get("org_list/", "Business::index");
$routes->get("new_org/(:any)", "Business::new_org/$1");
$routes->post("insert_org/", "Business::insert_org");
$routes->get("delete_org/(:any)", "Business::delete_org/$1");
-#Routes for Donor Routes
+#Donor Routes (also known as contributor,customer)
$routes->get("Contributor_list/", "Customer::index");
$routes->get("new_Donor/(:any)", "Customer::new_Donor/$1");
$routes->get('Customer/getReceiptDetails/(:num)', 'Customer::getReceiptDetails/$1');
-// In your routes file (e.g., app/Config/Routes.php)
-
-
$routes->post("insert_donor", "Customer::insert_donor");
$routes->post("insert_ajaxdonor", "Customer::insert_ajaxdonor");
$routes->get("delete_donor/(:any)", "Customer::delete_donor/$1");
-#Routes for donor group (renamed as contributor group : 20/03/2024)
+#Donor group Routes (renamed as contributor group : 20/03/2024)
$routes->get('contributor_group/', 'Customer::donor_group');
$routes->get('view_contributor_group/(:any)', 'Customer::view_donor_group/$1');
$routes->get('preview_contributor_group/(:any)', 'Customer::preview_donor_group/$1');
$routes->get('delete_contributor_group/(:any)', 'Customer::delete_donor_group/$1');
$routes->post("insert_contributor_group", "Customer::insert_donor_group");
-
-
-#adres priknt
-$routes->get('addressprint/', 'Address::index');
-$routes->post('address/generatePdf', 'Address::generatePdf');
-
-#Routes for campaign
+#Campaign Routes (also known as Event)
$routes->get("campaign_list/", "Event::index");
$routes->get("new_campaign/(:any)", "Event::new_campaign/$1");
$routes->post("insert_event/", "Event::insert_event");
-
$routes->get('invoice_number_format/(:any)', 'Event::invoice_number_format/$1');
$routes->post("insert_invoice_number_format", "Event::insert_invoice_number_format");
-#Routes for Receipt Routes
+#Receipt Routes (also known as Invoice)
$routes->get("receipt_list/", "Invoice::index");
$routes->get("new_receipt/(:any)", "Invoice::new_receipt/$1");
$routes->post("donor_cash_success/", "Invoice::donor_cash_success");
@@ -121,17 +100,14 @@ $routes->get("donations_accepted/", "Invoice::donations_accepted");
$routes->post("save_donations_accepted/", "Invoice::save_donations_accepted");
$routes->get("audit_history", "Invoice::audit_history");
$routes->get('generate-pdf/(:num)', 'Invoice::generatePdf/$1');
-// app/config/Routes.php
-
$routes->get('Invoice/showInvoiceModal', 'Invoice::showInvoiceModal');
-
$routes->post("get_donor_details", "Invoice::get_donor_details");
$routes->post("save_invoice/", "Invoice::save_invoice/");
$routes->add('approve_invoice/(:num)', 'Invoice::approve_invoice/$1');
$routes->get('generate_invoice_pdf/(:num)', 'Invoice::generate_invoice_pdf/$1');
$routes->get('print_address/(:num)', 'Invoice::print_address/$1');
-$routes->get('print_address/(:num)', 'Invoice::print_address/$1');
+#Report Routes
$routes->match(['get','post'],'/general_inv_rp','Invoice::general_inv_rp');
$routes->match(['get','post'],'/mem_inv_rp','Invoice::general_membership_inv_rp');
$routes->match(['get','post'],'/itemwise_report','Invoice::itemwise_report');
@@ -139,7 +115,6 @@ $routes->match(['get','post'],'/itemwise_report','Invoice::itemwise_report');
# Notifications Routes
// $routes->get('controller/SubExpdetail/(:num)', 'YourController::SubExpdetail/$1');
-
$routes->cli("getExpCustomerDetail/(:num)",'Notifications::getExpCustomerDetail/$1');
$routes->get('send_whatsapp_message/', 'Notifications::send_whatsapp_message');
$routes->post('whatsapp_custom_notifications/', 'Notifications::whatsapp_custom_notifications');
@@ -151,24 +126,12 @@ $routes->get('template_creation/', 'Notifications::template_creation');
$routes->get('template_creation_form/(:any)', 'Notifications::template_creation_form/$1');
$routes->get('template_creation_delete/(:any)', 'Notifications::template_creation_delete/$1');
$routes->post("template_creation_insert", "Notifications::template_creation_insert");
-
$routes->get('campaign_creation/', 'Notifications::campaign_creation');
$routes->get('campaign_creation_form/(:any)', 'Notifications::campaign_creation_form/$1');
$routes->get('campaign_creation_delete/(:any)', 'Notifications::campaign_creation_delete/$1');
$routes->post("campaign_creation_insert", "Notifications::campaign_creation_insert");
-
-# Api integration Routes
-$routes->post('api/(:any)', 'ApiIntegration::api_integration/$1');
-
-// $routes->group("api", function ($routes) {
-// // $routes->post("create_products/", "ApiIntegration::save_book_details");
-// // $routes->match(['put', 'post', 'get', 'delete'], 'products', 'ApiIntegration::book_api_integration');
-// // $routes->match(['put', 'post', 'get', 'delete'], 'customers', 'ApiIntegration::customer_api_integration');
-// // $routes->match(['put', 'post', 'get', 'delete'], 'orders', 'ApiIntegration::sales_api_integration');
-// });
-
/*
* --------------------------------------------------------------------
* Additional Routing
diff --git a/app/Controllers/Address.php b/app/Controllers/Address.php
deleted file mode 100644
index 40e2e11..0000000
--- a/app/Controllers/Address.php
+++ /dev/null
@@ -1,54 +0,0 @@
-findAll();
- return view('address_list', $data);
- }
-}
-
-
-
-// public function generatePdf()
-// {
-// $customerModel = new CustomerModel();
-
-// $customer_id = $this->request->getPost('customer_id');
-// $customerData = $customerModel->find($customer_id);
-
-// if ($customerData) {
-
-// $options->set('isHtml5ParserEnabled', true);
-// $options->set('isPhpEnabled', true);
-// $dompdf = new Dompdf($options);
-
-
-// $html = view('address_list', ['customerData' => $customerData]);
-
-
-// $dompdf->loadHtml($html);
-
-
-// $dompdf->setPaper('A4', 'portrait');
-
-// $dompdf->render();
-
-
-// $dompdf->stream('customer_information.pdf', ['Attachment' => 0]);
-// } else {
-
-// return redirect()->to('index');
-// }
-// }
-// }
diff --git a/app/Controllers/ApiIntegration.php b/app/Controllers/ApiIntegration.php
deleted file mode 100644
index c5ac467..0000000
--- a/app/Controllers/ApiIntegration.php
+++ /dev/null
@@ -1,1209 +0,0 @@
-global_variable_business_id = 1;
- $this->global_variable_role = "Online";
- $api_model = new ApiIntegrationModel();
- $table = 'users';
- $where = ['role'=>$this->global_variable_role,'business_id'=>(int)$this->global_variable_business_id];
- $existing_data = $api_model->getData($table, $where);
- $this->global_variable_user_id = isset($existing_data[0]->user_id) ? (int)$existing_data[0]->user_id : NULL;
- $this->global_variable_user_name = isset($existing_data[0]->user_id) ? $existing_data[0]->first_name." ".$existing_data[0]->last_name : NULL;
- }
-
- public function api_integration($api_request_text) {
- $this->logger->info("Api Integration : UID = ".$this->global_variable_user_id." * ".$this->global_variable_user_name);
- $this->logger->info("Api Integration : Request Text = ".$api_request_text);
- try {
- $request_data = $this->request->getVar();
- $this->logger->info("Api Integration : Request data type = ".gettype($request_data));
- if(isset($request_data) && gettype($request_data) === 'object') {$request_data = [$request_data]; $this->logger->info("Api Integration : Request data type = ".gettype($request_data));}
-
- if(count($request_data)>0){
- $this->logger->info("Api Integration : Request data count = ".count($request_data));
- $this->logger->info("Api Integration : Request data = ".json_encode($request_data));
- $i = 0;
- $final_response = [];
- foreach($request_data as $row_data)
- {
- $get_response[$i] = $this->call_methods((array)$row_data, $api_request_text);
- $final_response[$i] = isset($get_response[$i]['message'])?$get_response[$i]['message']:$get_response[$i];
- $i++;
- }
- // return $this->respond(['status' => 200, 'message' => $final_response,'references'=>$get_response]);
- return $this->respond(['status' => 200, 'message' => $final_response]);
- }else{
- $this->logger->error('Api Integration : Err = Request data Not Found.');
- throw new \Exception('Api Request data Not Found.');
- }
-
- } catch (\Exception $e) {
- // $this->logger->error("Api Integration : ".str_replace("_", " ",ucwords($api_request_text))." {exception}", ['exception' => $e]);
- $this->logger->error("Api Integration : ".str_replace("_", " ",ucwords($api_request_text))." Exception Message: " . $e->getMessage() . "';
- // print_r($data); die;
$this->render_page('book_list', $data);
} else {
// Session is not active or user is not logged in
return redirect()->to('login');
}
}
-
- ## To Load Book Form (Add/Update)
+
+ ## To Load Causes Form (Add/Update)
public function add_causes($id)
{
helper('session');
@@ -60,8 +58,8 @@ class Books extends BaseController
$this->render_page('book_form', $data);
}
- ## For inserting/updating details of book
- public function insert_books()
+ ## For inserting/updating details of Cause
+ public function insert_causes()
{
try{
helper('session');
@@ -121,8 +119,8 @@ class Books extends BaseController
return redirect()->route('causes_list');
}
- ## For delete the book details (Which means inactive the details)
- public function delete_books($id)
+ ## For delete the causes details (Which means inactive the details)
+ public function delete_causes($id)
{
try {
helper('session');
@@ -146,5 +144,4 @@ class Books extends BaseController
return redirect()->route('causes_list');
}
-
}
diff --git a/app/Controllers/Business.php b/app/Controllers/Business.php
index 0c52e5d..1c6d92a 100644
--- a/app/Controllers/Business.php
+++ b/app/Controllers/Business.php
@@ -22,7 +22,7 @@ class Business extends BaseController
}
$BusinessModel = new BusinessModel();
$data['page_name'] = 'Organization Details';
- $data['businesses'] = $BusinessModel->where($where)->where('business_id !=', 0)->where('isactive', 1)->findAll();
+ $data['organzations'] = $BusinessModel->where($where)->where('business_id !=', 0)->where('isactive', 1)->findAll();
// $data['lastQuery'] = $BusinessModel->getLastQuery();
// print_r($data);die;
$this->render_page('business_list', $data);
@@ -42,7 +42,7 @@ class Business extends BaseController
if ($id === '0') {
$data['page_name'] = 'Add Organization';
$data['loged_user'] = $session_role;
- $data['businesses'] = [];
+ $data['organzations'] = [];
$data['branches'] = [];
$data['donation']=[];
} else if ($id !== '0') {
@@ -52,8 +52,8 @@ class Business extends BaseController
$model->setTable('business');
## Fetch business details (particular business)
- $edit_business_details = $model->where(['business_id ' => $id , 'isactive' => 1])->first();
- $data['businesses'] = $edit_business_details;
+ $edit_organzation_details = $model->where(['business_id ' => $id , 'isactive' => 1])->first();
+ $data['organzations'] = $edit_organzation_details;
## Fetch branch details
$branch_details = $model->getBranchesByBusinessId($id);
@@ -67,12 +67,12 @@ class Business extends BaseController
}
- $data['master_business_details']=$this->business_details();
+ $data['master_organzation_details']=$this->organzation_details();
$data['session_bid']=$session_bid;
$this->render_page('business_form', $data);
}
- public function business_details()
+ public function organzation_details()
{
helper('session');
$session_role = get_user_role();
@@ -82,13 +82,13 @@ class Business extends BaseController
$model->setTable('business');
if($session_role === 'sadmin'){
- $business_details = $model->where('business_id !=', 0)->orderBy('business_id', 'DESC')->findAll();
+ $organzation_details = $model->where('business_id !=', 0)->orderBy('business_id', 'DESC')->findAll();
}
else{
- $business_details = $model->where('business_id', $session_bid)->findAll();
+ $organzation_details = $model->where('business_id', $session_bid)->findAll();
}
- return $business_details;
+ return $organzation_details;
}
diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php
index d70f608..76c5842 100644
--- a/app/Controllers/Home.php
+++ b/app/Controllers/Home.php
@@ -40,4 +40,23 @@ class Home extends BaseController
}
+ public function check_existing()
+ {
+ $value = $this->request->getPost('value');
+ $table = $this->request->getPost('module');
+ $field = $this->request->getPost('field');
+ $model = new HomeModel();
+ // $model->setTable('customers');
+ $model->setTable((string)$table);
+ $where = [$field => $value];
+ $check_existing = $model->where($where)->findAll();
+
+ $statement_string = ucfirst(str_replace('_', ' ', (string)$field));
+ $data = ['status' => false, 'message' => '']; // Initialize the data array
+ if (!empty($check_existing)) {
+ $data['status'] = true;
+ $data['message'] = $statement_string." Already existing";
+ }
+ return $this->response->setJSON(['data' => $data]);
+ }
}
diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php
index 58c8f70..b387175 100644
--- a/app/Controllers/Invoice.php
+++ b/app/Controllers/Invoice.php
@@ -125,7 +125,7 @@ class Invoice extends BaseController
// receipt number
$settingData = $this->BusinessModel->select('*')->where($where)->findAll();
- $count_receipt_no = (count($receipt) > 0) ? count($receipt) + $settingData[0]['start_no'] + 1 : $settingData[0]['start_no'] + 1;
+ $count_receipt_no = (count($receipt) > 0) ? count($receipt) + $settingData[0]['start_no'] : $settingData[0]['start_no'];
// Calculate padding based on the count of digits in count_receipt_no
$padding_count = max(0, $settingData[0]['left_pad'] - strlen($count_receipt_no));
@@ -139,7 +139,7 @@ class Invoice extends BaseController
$data['causes'] = $bmodel->select('*')->where('business_id', (int)get_business_id())->where('isactive',1)->get()->getResult();
$data['campaign'] = $model->getData('campaign', $where);
$data['invoice_number_formatting'] = $model->getData('business', $where);
- $data['receipt_type'] = "option1";
+ $data['receipt_type'] = "individual";
if ($id === '0') {
$this->logger->info("Receipt: In Add Details");
$data['page_name'] = 'Add Receipt Details';
@@ -515,6 +515,7 @@ class Invoice extends BaseController
$currency_data = $model->setTable('business')->select('currency')->where($where)->findAll();
$terms_data = $this->BusinessModel->select('terms,signature')->where($where)->findAll();
$data = $model->getInvoiceData($id);
+ // print_r($data);die;
// Check if data is empty
if (!$data || !$currency_data) {
throw new \Exception('Data not found or empty');
@@ -533,13 +534,16 @@ class Invoice extends BaseController
$dompdf = new Dompdf($options);
define("DOMPDF_UNICODE_ENABLED", true);
- $user = $this->UserModel->select('first_name')->where('user_id',$data[0]->created_by)->findAll();
- $logoPath = base_url()."public/uploads/".$data[0]->business_logo;
+ $user = $this->UserModel->select('first_name')->where('user_id',$data[0]->created_by)->findAll();
+
+ clearstatcache();
- if ($data[0]->business_logo && file_exists($logoPath)) {
- $baseurl = $logoPath;
+ // var_dump(file_exists($logoPath));
+ if ($data[0]->business_logo && file_exists(ROOTPATH."public/uploads/".$data[0]->business_logo)) {
+ // echo "Inside: Logo exists';
- // print_r($data); die;
- $this->render_page('setting_form', $data);
- }
- public function business_details()
- {
- helper('session');
- $session_role = get_user_role();
- $session_bid = get_business_id();
-
- $model = new BusinessModel();
- $model->setTable('business');
- if($session_role === 'sadmin'){
-
- $business_details = $model->where('business_id !=', 0)->orderBy('business_id', 'DESC')->findAll();
- }
- else{
- $business_details = $model->where('business_id', $session_bid)->findAll();
-
- }
- return $business_details;
- }
-
-
- ## To Save/Update Setting Data on DB.
- public function sitesetting_synchronization()
- {
- helper('session');
- $session_bid = get_business_id();
- $session_uid = get_logged_user_id();
- $session_role = get_user_role();
-
- $img = $this->request->getFile('slogo');
- print_r($img);
- $business_id = $this->request->getPost('business_id');
- $app_setting_id = $this->request->getPost('app_setting_id');
- $filePath = 'public/uploads/' . $this->request->getPost('slogo');
- $fileName = $img->getName();
- var_dump($fileName);
- echo $fileName;
- echo $fileName !== "" && $fileName !== null ? "Yes":"No";
- // die();
-
- if($fileName !== ""){
-
- if ($img->isValid() && !$img->hasMoved()) {
-
- $img->move(ROOTPATH . 'public/uploads', $fileName);
- }
-
- }
-
-
- $favicon = $this->request->getFile('favicon');
- $faviconName = $favicon->getName();
-
- if($faviconName !== ""){
-
- if ($favicon->isValid() && !$favicon->hasMoved()) {
-
- $favicon->move(ROOTPATH . 'public/uploads', $faviconName);
- }
- }
-
- $SettingsModel = new SettingsModel();
- $data = [
-
- 'site_name' => $this->request->getPost('site_name'),
- 'site_title' => $this->request->getPost('site_title'),
- 'terms_service' => $this->request->getPost('terms_service'),
- 'footer_about' => $this->request->getPost('footer_about'),
- 'admin_email' => $this->request->getPost('admin_email'),
- 'mobile'=> $this->request->getPost('mobile'),
- 'copyright'=> $this->request->getPost('copyright'),
- 'pagination_limit'=> $this->request->getPost('pagination_limit'),
- 'site_info'=> $this->request->getPost('site_info'),
- 'about_info'=> $this->request->getPost('about_info'),
- 'mail_protocol'=> $this->request->getPost('mail_protocol'),
- 'mail_title'=> $this->request->getPost('mail_title'),
- 'mail_host'=> $this->request->getPost('mail_host'),
- 'mail_port'=> $this->request->getPost('mail_port'),
- 'mail_encryption'=> $this->request->getPost('mail_encryption'),
- 'mail_username'=> $this->request->getPost('mail_username'),
- 'mail_password'=> $this->request->getPost('mail_password'),
- 'currency'=> $this->request->getPost('currency'),
- 'country'=> $this->request->getPost('country'),
- 'business_id'=> $this->request->getPost('business_id'),
- 'start_no'=> $this->request->getPost('start_no'),
- 'left_pad'=> $this->request->getPost('left_pad'),
- 'prefix_format'=> $this->request->getPost('prefix_format'),
- ];
-
- if($fileName !== "" && $fileName !== null)
- {
- $data['logo'] = $fileName;
- }
-
- if($faviconName !== "" && $faviconName !== null)
- {
- $data['favicon'] = $faviconName;
- }
-
- // echo '';
- // print_r($data); die;
-
- $setting_id = $this->request->getPost('setting_id'); // Get the business ID for update
-
- if (empty($setting_id)) {
- // It's an insert operation
- $data['isactive'] = 1;
- $data['created_by'] = $session_uid;
-
- $SettingsModel->insert($data);
- // print_r($data);die;
- } else {
- // It's an update operation
- $isactive = $this->request->getPost('isactive');
- $data['isactive'] = ($isactive == 'on') ? 1 : 0;
- $data['updated_by'] = $session_uid;
- $SettingsModel->update($setting_id, $data);
- }
-
- if($session_role === 'sadmin'){
-
- return redirect()->route('sitesetting_list');
- }
- else{
- return redirect()->route('dashboard');
- }
- }
-}
-
-
-// $model = new SettingsModel();
-// $model->setTable('settings');
-// if ($this->request->is('post')) {
-// $requestData = $this->request->getVar();
-// }
-// $requestData['business_id'] = $session_bid;
-// if ($requestData['setting_id']) {
-// #edit
-// $requestData['updated_by'] = $session_uid;
-// $requestData['isactive'] = isset($requestData['isactive']) && $requestData['isactive'] == 'on' ? 1 : 0;
-// $model->saveData($requestData, $requestData['setting_id']);
-// $alert_message = "Site Settings details successfully updated.";
-// } else {
-// #add
-// $requestData['created_by'] = $session_uid;
-// $requestData['isactive'] = 1;
-// $model->saveData($requestData, null);
-// $alert_message = "Site Settings details successfully created.";
-// }
-// return redirect()->route('sitesetting_list');
-// }
-// }
diff --git a/app/Controllers/Subscription.php b/app/Controllers/Subscription.php
deleted file mode 100644
index d77b3ab..0000000
--- a/app/Controllers/Subscription.php
+++ /dev/null
@@ -1,217 +0,0 @@
-logger->info("Invoice: Listing In Admin BID = " . $session_bid);
- $where = ['I.business_id' => (int)$session_bid, 'I.isactive' => 1];
- } else {
- $this->logger->info("Invoice: Listing In the Super-Admin ");
- $where = ['I.business_id != ' => NULL, 'I.isactive != ' => NULL];
- }
-
- $model = new InvoiceModel();
- $data['page_name'] = 'Subscription Invoice Details';
- $data['invoice'] = $model->getSubscriptionInvoiceDetail($where);
-
- $this->logger->info("Invoice: Listing Count ." . count($data['invoice']));
-
-
- // $data['subscriber'] = $SubscriptionModel->where($where)->findAll();;
-
-
- $SubscriptionModel = new SubscriptionModel();
- $swhere = ['subscription.business_id' => (int)$session_bid];
- $data['subscriber'] = $SubscriptionModel->getAllSubscribersWithNames($swhere);
- $this->render_page('subscribers_list', $data);
- }else {
- return redirect()->to('login');
- }
-}
- public function new_subscription() {
-
- helper('session');
- helper('session');
- $session_bid = get_business_id();
- $data['page_name'] = 'Subscription Details';
- $customerModel = new CustomerModel();
- $schemeModel = new SchemeModel();
-
- $business_id = get_business_id();
-
- // Get scheme names and durations from the SchemeModel
- $data['customers'] = $customerModel->getCustomerNamesByBusiness($business_id);
- $data['scheme_names'] = $schemeModel->getSchemeNamesAndDurationsByBusiness($business_id);
-
- //print_r($data);die();
- $this->render_page('subscription_form', $data);
-}
-
-// Subscription Controller (Subscription.php)
-public function add_subscription() {
- helper('session');
- $session_bid = get_business_id();
- $session_uid = get_logged_user_id();
-
- $SubscriptionModel = new SubscriptionModel();
- $data = [
- 'scheme_id' =>$this->request->getPost('scheme'),
- 'customer_id' =>$this->request->getPost('customer'),
- 'from_subscription' => $this->request->getPost('from_date'),
- 'to_subscription' => $this->request->getPost('to_date'),
- // 'type' => "subscribed customer",
- 'type' => "customer",
- 'mode' => $this->request->getPost('mode'),
- 'business_id'=>$session_bid
- ];
-
- $SubscriptionModel->insert($data);
-
- // $data['subscriber'] = $subscriberModel->getAllSubscribersWithNames();
- // print_r($data);die();
- return redirect()->to('subscribers_list')->with('data', $data);
-}
-
-// Subscription.php (Controller)
-
-// public function download_details()
-// {
-// $selectedScheme = $this->request->getPost('selected_scheme');
-
-// // Call the model method to get customer details for the selected scheme
-// $subscriptionModel = new SubscriptionModel();
-// $business = $subscriptionModel->getCustomerAddressesBySchemeName($selectedScheme);
-
-// $shippingInfo = $subscriptionModel->getCustomerAddressesBySchemeName($selectedScheme, 2);
-// $customerName = $subscriptionModel->getCustomerNameBySchemeName($selectedScheme);
-
-// // Create an HTML content string using the view file (similar to print_addresses.php)
-// if ($customerName !== 'Customer not found') {
-// $html = view('print_addresses_form', ['customerName' => $customerName, 'shippingInfo' => $shippingInfo, 'business' => $business]);
-
-// // Generate a PDF from the HTML content
-// $pdf = new Mpdf();
-
-// $pdf->WriteHTML($html);
-
-// // Set the PDF filename
-// $filename = 'CustomerDetails_' . date('YmdHis') . '.pdf';
-
-// // Output the PDF for download
-// $pdf->Output($filename, 'D');
-// } else {
-// // Handle the case where the customer is not found
-// echo 'Customer not found';
-// }
-// }
-
-public function download_details()
-{
- $selectedSchemes = $this->request->getPost('selected_schemes');
- $action = $this->request->getPost('action');
- // Initialize an empty PDF with custom paper size (4x6 inches)
- $config = [
- 'mode' => 'utf-8',
- 'format' => [101.6, 152.4],
- 'default_font_size' => 12,
- 'default_font' => 'Arial',
- 'margin_left' => 0,
- 'margin_right' => 0,
- 'margin_top' => 0,
- 'margin_bottom' => 0,
- 'margin_header' => 0,
- 'margin_footer' => 0,
- 'orientation' => 'P', // Portrait
- ];
-
- $configA4 = [
- 'mode' => 'utf-8',
- 'format' => [101.6 * 2, 152.4 * 4], // 2x4 inches for each label
- 'default_font_size' => 12,
- 'default_font' => 'Arial',
- 'margin_left' => 0,
- 'margin_right' => 0,
- 'margin_top' => 0,
- 'margin_bottom' => 0,
- 'margin_header' => 0,
- 'margin_footer' => 0,
- 'orientation' => 'P', // Portrait
- ];
-
-
- if($action == 1) $pdf = new Mpdf($config);
- else $pdf = new Mpdf();
- $customerDetails = [];
- // Iterate through selected schemes
- if (!empty($selectedSchemes)) {
- foreach ($selectedSchemes as $selectedScheme) {
- // Call the model method to get customer details for each selected scheme
- $subscriptionModel = new SubscriptionModel();
- $details = $subscriptionModel->getAllCustomerDetailsBySchemeName($selectedScheme);
- $customerDetails = array_merge($customerDetails, $details);
- }
-
- if (!empty($customerDetails)) {
- $html = view('print_addresses_form', ['customerDetails' => $customerDetails , 'action' => $action , 'pdf' => $pdf]);
- // Add the current scheme's details to the PDF
- // echo $html;die;
- // $pdf->AddPage();
- $pdf->WriteHTML($html);
- // Set the PDF filename
- $filename = 'CustomerDetails_' . date('YmdHis') . '.pdf';
-
- // Output the PDF for download
- $pdf->Output($filename, 'D');
- $this->logger->info("Print Addresses (Scheme) : Downloaded = ".$filename);
- } else {
- echo "";
- $this->logger->info("Print Addresses (Scheme) : Details Not Available ");
- }
- } else {
- echo "";
- $this->logger->info("Print Addresses (Scheme) : Schemes Not Choosen ");
- }
-
-}
-
-
-
-
-}
-// public function generate_pdf()
-// {
-// $schemeName = $this->request->getGet('scheme_name');
-
-// // Call the model method to get the customer's name and address (billing or shipping)
-// $subscriptionModel = new SubscriptionModel();
-
-// // For billing address
-// $billingInfo = $subscriptionModel->getCustomerAddressesBySchemeName($schemeName, 1);
-
-// // For shipping address
-// $shippingInfo = $subscriptionModel->getCustomerAddressesBySchemeName($schemeName, 2);
-// print_r($billingInfo);
-// print_r($shippingInfo);
-
-
-// // Handle the PDF generation using $billingInfo['customer_name'], $billingInfo['address'] (for billing address)
-// // and $shippingInfo['customer_name'], $shippingInfo['address'] (for shipping address)
-// }
-
-
diff --git a/app/Controllers/Users.php b/app/Controllers/Users.php
index 964488a..7c086b0 100644
--- a/app/Controllers/Users.php
+++ b/app/Controllers/Users.php
@@ -4,7 +4,6 @@ namespace App\Controllers;
use App\Models\UsersModel;
use App\Models\BusinessModel;
-use CodeIgniter\Files\File;
class Users extends BaseController
{
@@ -15,20 +14,23 @@ class Users extends BaseController
$session_role = get_user_role();
$session_bid = get_business_id();
- $session_role = get_user_role();
-
- if (!empty($session_role) && $session_role !== "sadmin") {
- $this->logger->info("Users: Listing In admin role . BID = ".$session_bid);
- $where = ['users.business_id' => (int)$session_bid, 'users.isactive' => 1];
- } else {
+
+ if (!empty($session_role) && $session_role === "sadmin") {
$this->logger->info("Users: Listing In Super-admin role .");
$where = ['users.isactive !=' => NULL];
+ }else if (!empty($session_role) && $session_role === "admin") {
+ $this->logger->info("Users: Listing In admin role . BID = ".$session_bid);
+ $where = ['users.business_id' => (int)$session_bid];
+ } else {
+ $this->logger->info("Users: Listing In ".$session_role." role . BID = ".$session_bid);
+ $where = ['users.business_id' => (int)$session_bid, 'users.isactive' => 1];
}
$model = new UsersModel();
$model->setTable('users');
// $user_details = $model->where($where)->orderBy('user_id', 'DESC')->findAll();
- $user_details = $model->select('users.*, business.title as org_name')
+ $user_details = $model->select('users.*, business.title as org_name,business_branches.branch_name')
->join('business', 'business.business_id = users.business_id')
+ ->join('business_branches', 'business_branches.id = users.branch_id','left')
->where($where)->orderBy('user_id', 'DESC')->findAll();
$this->logger->info("Users: Listing Count .".count($user_details));
@@ -36,8 +38,6 @@ class Users extends BaseController
$data['loged_user'] = $session_role;
$data['details'] = $user_details;
- // echo '';
- // print_r($data); die;
$this->render_page('user_list', $data);
}
@@ -49,7 +49,7 @@ class Users extends BaseController
$session_role = get_user_role();
$session_bid = get_business_id();
$session_uid = get_logged_user_id();
- $data['business_details'] = $this->business_details();
+ $data['organzation_details'] = $this->organzation_details();
$data['dummy_flag'] = $flag; // for redirect purpose.
if ($id === '0') {
$this->logger->info("Users: In Add page");
@@ -57,7 +57,7 @@ class Users extends BaseController
$render_page_name = 'user_form';
$data['details'] = [];
$data['branches'] = $this->getOrganizationBranches($session_bid);
- // print_r($data);
+
} else {
$this->logger->info("Users: In Edit page");
$model = new UsersModel();
@@ -72,7 +72,6 @@ class Users extends BaseController
$data['page_name'] = 'Edit User';
// Fetch organization branches for the selected organization
$data['branches'] = $this->getOrganizationBranches($edit_user_details['business_id']);
- // print_r($data);die;
break;
case "admin":
@@ -81,7 +80,6 @@ class Users extends BaseController
$render_page_name = 'user_form';
$data['page_name'] = 'Edit User';
$data['branches'] = $this->getOrganizationBranches($edit_user_details['business_id']);
- // print_r($branches);die;
break;
case "volunteer":
@@ -90,9 +88,7 @@ class Users extends BaseController
if ($session_uid === $id && $session_role === "volunteer") {
$data['page_name'] = 'Edit User';
$data['branches'] = $this->getOrganizationBranches($edit_user_details['business_id']);
-
$render_page_name = 'user_form';
-
} else {
$data['page_name'] = 'Page Not Found';
$render_page_name = 'pages_404';
@@ -129,7 +125,7 @@ class Users extends BaseController
$this->render_page($render_page_name, $data);
}
- // Add the getOrganizationBranches method
+ ## Add the getOrganizationBranches method
public function getOrganizationBranches($businessId)
{
$db = db_connect();
@@ -140,13 +136,12 @@ class Users extends BaseController
return $branches;
}
-
## For SuperAdmin Role business Dropdown displayed on Userpage.otherwise Hidden fields
- public function business_details()
+ public function organzation_details()
{
$model = new BusinessModel();
$model->setTable('business');
- $business_details = $model->orderBy('business_id', 'DESC')->findAll();
+ $organzation_details = $model->orderBy('business_id', 'DESC')->findAll();
// Fetch branches for all organizations
$branchModel = new BusinessModel();
@@ -154,29 +149,21 @@ class Users extends BaseController
$branches = $branchModel->findAll();
// Add branches to each business
- foreach ($business_details as &$business) {
+ foreach ($organzation_details as &$business) {
$business['branches'] = array_filter($branches, function ($branch) use ($business) {
return $branch['business_id'] == $business['business_id'];
});
}
- return $business_details;
+ return $organzation_details;
}
-
## For inserting/updating details of user
public function insert_users()
{
$this->logger->info("Users: Inserting/Updating Details");
try {
- ## CI validation rule for profile_picture
- $validationRule = [
- 'profile_picture' => [
- 'label' => 'Image File',
- 'rules' => 'uploaded[profile_picture]|is_image[profile_picture]|mime_in[profile_picture,image/jpg,image/jpeg,image/gif,image/png,image/webp]'
- ]
- ];
-
+
## Declarions
helper('session');
$UsersModel = new UsersModel();
@@ -184,83 +171,20 @@ class Users extends BaseController
$session_bid = get_business_id();
$user_id = $this->request->getPost('user_id');
$business_id = $this->request->getPost('business_id')?$this->request->getPost('business_id'):$session_bid;
- $img_details = $this->request->getFile('profile_picture'); // Here I Have Image details ;
- $final_img_name = NULL;//Just flag
- $existing_img_name = $this->request->getPost('existing_profile_picture_name'); // HiddenField for if have any pic name means;
- $img_path = 'public/uploads/';
- ##Step 1 : image details available
- if($img_details){
- $this->logger->info("Users: image details avaiable");
- ##Step 2 : i have image details .
- Is Active
Save
-
+
Contributor Type *
--Select--
- >Individual
- >Organization
+ >Individual
+ >Organization
Please provide.
@@ -250,7 +250,7 @@
let DonorType = $('#DonorType').val();
// Organization type selected
- if (DonorType === 'option2') {
+ if (DonorType === 'organization') {
$('#org_name').show();
$('#org_reg').show();
$('.contactPerson').show();
diff --git a/app/Views/customer_list.php b/app/Views/customer_list.php
index 946b1c5..55402c8 100644
--- a/app/Views/customer_list.php
+++ b/app/Views/customer_list.php
@@ -39,16 +39,16 @@
-
+
-
+
diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php
index 6b49d94..8359d10 100644
--- a/app/Views/dashboard.php
+++ b/app/Views/dashboard.php
@@ -1,4 +1,5 @@
-
-
+
\ No newline at end of file
diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php
index 4884238..11dea00 100644
--- a/app/Views/invoice_form.php
+++ b/app/Views/invoice_form.php
@@ -19,25 +19,17 @@