diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index d836adb..b450b3e 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -46,24 +46,26 @@ $routes->match(['get','post'],'all_donation_cause','Dashboard::all_donation_caus
//$routes->add('edit_donor/(:num)', 'App\Catalog::productLookup');
//$routes->match(['get'],'edit_donor/(:any)', 'My_controller::edit_donor');
-$routes->get('(:num)', 'My_controller::edit_donor/$1');
+$routes->get('edit_donor/(:num)', 'My_controller::edit_donor/$1');
$routes->get('edit_receipt/(:num)', 'Dashboard::edit_receipt/$1');
$routes->get('view_receipt/(:num)', 'Dashboard::view_receipt/$1');
$routes->match(['get','post'],'edit_transaction/(:num)', 'Dashboard::edit_transaction/$1');
$routes->match(['get','post'],'edit_donation_data/(:num)', 'Dashboard::edit_donation_data/$1');
$routes->match(['get','post'],'edit_donation_cause/(:num)', 'Dashboard::edit_donation_cause/$1');
-$routes->match(['get','post'],'register','Donor_controller::register');
+$routes->match(['get','post'],'signup','Donor_controller::register');
$routes->match(['get','post'],'login','Donor_controller::login');
$routes->match(['get'],'fetch_country','Donor_controller::fetch_country');
$routes->match(['get','post'],'fetch_state','Donor_controller::fetch_state');
$routes->match(['get','post'],'fetch_city','Donor_controller::fetch_city');
+$routes->match(['get'],'profile','Donor_controller::profile');
$routes->match(['get','post'],'receipt','Dashboard::generate_receipts');
$routes->match(['get','post'],'update_receipt','Dashboard::update_receipt');
$routes->match(['get','post'],'transaction','Dashboard::transaction_upload');
$routes->match(['get','post'],'donation_data','Dashboard::donation_data_upload');
$routes->match(['get','post'],'donor_register','My_controller::donor_register');
+$routes->match(['get','post'],'update_donor','My_controller::update_donor');
$routes->match(['get'],'fetch_donor_id','Dashboard::fetch_donor_id');
$routes->match(['get'],'edit_donor_id','Dashboard::edit_donor_id');
diff --git a/app/Controllers/Dashboard.php b/app/Controllers/Dashboard.php
index 2b108f1..5f5a443 100644
--- a/app/Controllers/Dashboard.php
+++ b/app/Controllers/Dashboard.php
@@ -105,7 +105,7 @@ class Dashboard extends BaseController
//print_r($receiptData);die();
$model = new Receipt_model();
$model->save($receiptData);
- return redirect()->to(base_url().'/Dashboard/last_receipt');
+ return redirect()->to(base_url().'all_receipt');
}
function update_receipt()
@@ -188,6 +188,10 @@ class Dashboard extends BaseController
}
function last_receipt()
{
+ if(!session()->has('logged_user'))
+ {
+ return redirect()->to(base_url());
+ }
// admin data
$dmodel = new Donor_model();
$id= session()->get('logged_user');
@@ -214,6 +218,10 @@ class Dashboard extends BaseController
function view_receipt($receiptid)
{
+ if(!session()->has('logged_user'))
+ {
+ return redirect()->to(base_url());
+ }
// admin data
$dmodel = new Donor_model();
$id= session()->get('logged_user');
@@ -235,7 +243,7 @@ class Dashboard extends BaseController
// array for receipt
$data= [ 'donordata'=>$Donor_data , 'admindata' =>$admin_data , 'receipt'=>$receipt_data , 'causedata'=>$cause_data];
-
+ //print_r($data); die();
return view('receipt_view',$data);
}
diff --git a/app/Controllers/Donor_controller.php b/app/Controllers/Donor_controller.php
index cb73037..aebe46d 100644
--- a/app/Controllers/Donor_controller.php
+++ b/app/Controllers/Donor_controller.php
@@ -9,6 +9,7 @@ class Donor_controller extends BaseController
public $session;
public function __construct()
{
+
$this->session = session();
$this->Donor_model = new Donor_model();
$this->Dashboard_model = new Dashboard_model();
@@ -153,6 +154,13 @@ class Donor_controller extends BaseController
//echo view('templates/footer');
}
+
+ function profile()
+ {
+ $id= session()->get('logged_user');
+ $data['userdata']=$this->Dashboard_model->getLoggedInUserData($id);
+ return view('profile',$data);
+ }
function fetch_country()
{
diff --git a/app/Controllers/My_controller.php b/app/Controllers/My_controller.php
index 45a533e..7c8f673 100644
--- a/app/Controllers/My_controller.php
+++ b/app/Controllers/My_controller.php
@@ -20,8 +20,15 @@ class My_controller extends BaseController
public function donor_register()
{
+
$data['country']=$this->Dashboard_model->fetch_country();
helper(['form']);
+ if(!session()->has('logged_user'))
+ {
+ return redirect()->to(base_url());
+ }
+
+
if($this->request->getmethod() == 'post')
{
@@ -85,8 +92,8 @@ class My_controller extends BaseController
//print_r($donorData); die();
$model->save($donorData);
$session = session();
- $session ->setFlashdata('success','Successful Registration');
- return redirect()->to(base_url().'/Dashboard');
+ $session ->setFlashdata('success','Successful Added');
+ return redirect()->to(base_url().'/all_donor');
}
}
@@ -112,6 +119,10 @@ class My_controller extends BaseController
}
function edit_donor($id)
{
+ if(!session()->has('logged_user'))
+ {
+ return redirect()->to(base_url());
+ }
$model = new My_model();
$donor_data=$model->find($id);
$data= [ 'post'=>$donor_data ];
@@ -125,6 +136,38 @@ class My_controller extends BaseController
}
return view('donor_edit',$data);
+ }
+ function update_donor()
+ {
+ if(!session()->has('logged_user'))
+ {
+ return redirect()->to(base_url());
+ }
+
+ $donor_id=$this->request->getVar('id');
+
+
+ $DonorData=[
+
+ 'name' =>$this->request->getVar('name'),
+ 'phone' =>$this->request->getVar('phone'),
+ 'email' =>$this->request->getVar('email'),
+ 'pan' =>$this->request->getVar('pan'),
+ 'address' =>$this->request->getVar('address'),
+ 'country' =>$this->request->getVar('country'),
+ 'state' =>$this->request->getVar('state'),
+ 'city' =>$this->request->getVar('city'),
+ 'pin_code' =>$this->request->getVar('pin_code'),
+ 'date_of_birth' =>$this->request->getVar('date_of_birth'),
+ 'gender' =>$this->request->getVar('gender'),
+ 'org_name' =>$this->request->getVar('org_name'),
+ 'gstin' =>$this->request->getVar('gstin'),
+ ];
+ //print_r($DonorData);die();
+ $model = new My_model();
+ $model->update($donor_id , $DonorData);
+ return redirect()->to(base_url().'/all_donor');
+
}
function fetch_country()
diff --git a/app/Controllers/PdfController.php b/app/Controllers/PdfController.php
index f136f48..ad49b20 100644
--- a/app/Controllers/PdfController.php
+++ b/app/Controllers/PdfController.php
@@ -52,9 +52,15 @@ class PdfController extends Controller
$data= [ 'donordata'=>$Donor_data , 'admindata' =>$admin_data , 'receipt'=>$receipt_data , 'causedata'=>$cause_data];
//echo view('download_receipt',$data); die();
$html = view('download_receipt',$data);
+
$dompdf = new \Dompdf\Dompdf();
//$dompdf->loadHtml(view('download_receipt',$data));
- $dompdf->loadHtml($html);
+
+
+ $options = $dompdf->getOptions();
+ $options->set(array('isRemoteEnabled' => true));
+ $dompdf->setOptions($options);
+ $dompdf->loadHtml($html);
$dompdf->setPaper('A4', 'portrait');
$dompdf->render();
$dompdf->stream();
diff --git a/app/Controllers/Sendmail.php b/app/Controllers/Sendmail.php
index 2e38817..fcfbbeb 100644
--- a/app/Controllers/Sendmail.php
+++ b/app/Controllers/Sendmail.php
@@ -12,7 +12,7 @@ class Sendmail extends Controller
function Mail_to_donor()
{
- $to = 'gowthamceline46@gmail.com';
+ $to = '';
$subject = "hai";
$message = 'CI4';
diff --git a/app/Views/add_donation_cause.php b/app/Views/add_donation_cause.php
index b5f86c7..f70de6e 100644
--- a/app/Views/add_donation_cause.php
+++ b/app/Views/add_donation_cause.php
@@ -3,6 +3,23 @@
+
+
+
+
+
+
diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php
index a84fdb7..681171e 100644
--- a/app/Views/dashboard.php
+++ b/app/Views/dashboard.php
@@ -116,7 +116,7 @@
-
+
Profile
diff --git a/app/Views/donation_cause_edit.php b/app/Views/donation_cause_edit.php
index 555169f..cc24847 100644
--- a/app/Views/donation_cause_edit.php
+++ b/app/Views/donation_cause_edit.php
@@ -126,7 +126,7 @@
-
+
Logout
diff --git a/app/Views/donation_data_edit.php b/app/Views/donation_data_edit.php
index 1b53a35..2f2e0cb 100644
--- a/app/Views/donation_data_edit.php
+++ b/app/Views/donation_data_edit.php
@@ -126,7 +126,7 @@
-
+
Logout
diff --git a/app/Views/donor-table.php b/app/Views/donor-table.php
new file mode 100644
index 0000000..387d5d3
--- /dev/null
+++ b/app/Views/donor-table.php
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+
+
+
+ Donar App
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Name |
+ Phone |
+ Email |
+ Pan |
+ Address |
+ DOB |
+ Gender |
+ Org Name |
+ GSTIN |
+ Action |
+
+
+
+ |
+ |
+ |
+ |
+ ,,,. |
+ |
+ |
+ |
+ |
+ Edit |
+
+
+
+
+
+
+
+
+
+
+
-
?>/public/assets/logo.png){kind=logo}
 ?>/public/assets/uploads/logo2.png){kind=logo}
?>/<?=$admindata['signature']?>.png){kind=small}