diff --git a/.env b/.env
index 0f21ccf..95276f3 100644
--- a/.env
+++ b/.env
@@ -20,7 +20,7 @@
# APP
#--------------------------------------------------------------------
- app.baseURL = 'http://localhost/donation/'
+# app.baseURL = 'http://localhost/donation/'
# app.forceGlobalSecureRequests = false
# app.sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler'
diff --git a/app/Config/App.php b/app/Config/App.php
index 40309e9..d3c063f 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -22,8 +22,40 @@ class App extends BaseConfig
|
*/
- public $baseURL = 'http://localhost/donation/';
+ public $baseURL;
+ public function __construct()
+ {
+ if ('development' == $_ENV['CI_ENVIRONMENT'])
+ {
+ $this->baseURL = 'http://localhost/donation/';
+ }
+ else
+ {
+ $allowed_domains = array('domain1.co.uk', 'domain1.com', 'domain1-preview.host.co.uk');
+ $default_domain = 'domain1.co.uk';
+
+ if (in_array($_SERVER['HTTP_HOST'], $allowed_domains, true))
+ {
+ $domain = $_SERVER['HTTP_HOST'];
+ }
+ else
+ {
+ $domain = $default_domain;
+ }
+
+ if (!empty($_SERVER['HTTPS']))
+ {
+ $this->baseURL = 'https://' . $domain;
+ }
+ else
+ {
+ $this->baseURL = 'http://' . $domain;
+ }
+ }
+ parent::__construct();
+ }
+ // public $baseURL = BASE;
/*
|--------------------------------------------------------------------------
| Index File
diff --git a/app/Config/Email.php b/app/Config/Email.php
index 792beb7..41a2746 100644
--- a/app/Config/Email.php
+++ b/app/Config/Email.php
@@ -46,7 +46,7 @@ class Email extends BaseConfig
*
* @var string
*/
- public $SMTPHost = 'smtp.googlemail.com';
+ public $SMTPHost = 'ssl://smtp.gmail.com';
/**
* SMTP Username
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 4b90374..f957dbb 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -38,14 +38,22 @@ $routes->match(['get','post'],'fetch_state','Donor_controller::fetch_state');
$routes->match(['get','post'],'fetch_city','Donor_controller::fetch_city');
$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'],'fetch_donor_id','Dashboard::fetch_donor_id');
+$routes->match(['get'],'edit_donor_id','Dashboard::edit_donor_id');
$routes->match(['get'],'fetch_cause_name','Dashboard::fetch_cause_name');
$routes->match(['get','post'],'add_donation_cause','Dashboard::add_donation_cause');
$routes->match(['get'],'htmlToPDF','PdfController::htmlToPDF');
+$routes->match(['get'],'active_cause','Dashboard::active_cause');
+$routes->match(['get'],'inactive_cause','Dashboard::inactive_cause');
+
+
+$routes->match(['get','post'],'donation_data_excel','PhpspreadsheetController::import_donation_data');
+$routes->match(['get','post'],'transaction_data_excel','PhpspreadsheetController::import_transaction_data');
// $routes->add('register','Donation::register');
// $routes->add('list','Donation::edit_view');
// $routes->add('store','Home::store');
diff --git a/app/Controllers/Dashboard.php b/app/Controllers/Dashboard.php
index 00430cf..cfacec9 100644
--- a/app/Controllers/Dashboard.php
+++ b/app/Controllers/Dashboard.php
@@ -45,6 +45,11 @@ class Dashboard extends BaseController
function fetch_donor_id()
{
echo $this->MyModel->fetch_donor_id();
+ }
+ function edit_donor_id($receipt_id)
+ {
+ echo $receipt_id; die();
+ echo $this->MyModel->edit_donor_id();
}
function fetch_cause_name()
{
@@ -60,8 +65,7 @@ class Dashboard extends BaseController
}
$name= session()->get('logged_user');
- //$data['donor']=$this->MyModel->fetch_donor_id();
- //$data2['donor']=$this->MyModel->fetch_donor_id();
+
echo view('templates/header');
echo view('receipts');
echo view('templates/footer');
@@ -74,19 +78,68 @@ class Dashboard extends BaseController
{
return redirect()->to(base_url());
}
- $model = new Receipt_model();
+
+ $donor_id=$this->request->getVar('donor_id');
+ $mymodel = new My_model();
+ $donor = $mymodel->find($donor_id);
+ $donor_name = $donor['name'];
+
+ $cause_id=$this->request->getVar('cause_id');
+ $causemodel = new Donation_cause();
+ $cause = $causemodel->find($cause_id);
+ $cause_name = $cause['cause_name'];
+
$receiptData=[
- 'receipt_no' =>$this->request->getVar('receipt_no'),
+
'date' =>$this->request->getVar('date'),
'donor_id' =>$this->request->getVar('donor_id'),
+ 'donor_name' =>$donor_name,
'amount' =>$this->request->getVar('amount'),
'mode_of_receipt' =>$this->request->getVar('mode_of_receipt'),
'receipt_details' =>$this->request->getVar('receipt_details'),
- 'cause_name' =>$this->request->getVar('cause_name'),
+ 'cause_id' =>$this->request->getVar('cause_id'),
+ 'cause_name' =>$cause_name,
'remarks' =>$this->request->getVar('remarks'),
];
- $model->save($receiptData);
- return redirect()->to(base_url().'/Dashboard/last_receipt/');
+ $model = new Receipt_model();
+ $model->save($receiptData);
+ return redirect()->to(base_url().'/Dashboard/last_receipt');
+ }
+ function update_receipt()
+ {
+ if(!session()->has('logged_user'))
+ {
+ return redirect()->to(base_url());
+ }
+
+ $receipt_id=$this->request->getVar('receipt_id');
+
+ $donor_id=$this->request->getVar('donor_id');
+ $mymodel = new My_model();
+ $donor = $mymodel->find($donor_id);
+ $donor_name = $donor['name'];
+
+ $cause_id=$this->request->getVar('cause_id');
+ $causemodel = new Donation_cause();
+ $cause = $causemodel->find($cause_id);
+ $cause_name = $cause['cause_name'];
+
+ $receiptData=[
+
+ 'date' =>$this->request->getVar('date'),
+ 'donor_id' =>$this->request->getVar('donor_id'),
+ 'donor_name' =>$donor_name,
+ 'amount' =>$this->request->getVar('amount'),
+ 'mode_of_receipt' =>$this->request->getVar('mode_of_receipt'),
+ 'receipt_details' =>$this->request->getVar('receipt_details'),
+ 'cause_id' =>$this->request->getVar('cause_id'),
+ 'cause_name' =>$cause_name,
+ 'remarks' =>$this->request->getVar('remarks'),
+ ];
+ $model = new Receipt_model();
+ $model->update($receipt_id , $receiptData);
+ return redirect()->to(base_url().'/Dashboard/all_receipt');
+
}
public function all_receipt()
@@ -108,19 +161,25 @@ class Dashboard extends BaseController
{
return redirect()->to(base_url());
}
- $model = new Receipt_model();
- $receipt_data=$model->find($receipt_id);
- $data= [ 'post'=>$receipt_data ];
-
- if($this->request->getMethod() == 'post')
- {
- $model = new Receipt_model();
- $_POST['receipt_id'] = $receipt_id;
- $model->save($_POST);
- return redirect()->to(base_url()."/Dashboard/all_receipt");
- }
- echo view('templates/header',$data);
- echo view('receipt_edit');
+ $receipt_model = new Receipt_model();
+ $receipt_data=$receipt_model->find($receipt_id);
+
+ $donor_model = new My_model();
+ $donor_data=$donor_model->findAll();
+
+ $cause_model = new Donation_cause();
+ $cause_data=$cause_model->findAll();
+
+ $data= [ 'post'=>$receipt_data , 'donor'=>$donor_data , 'cause'=>$cause_data ];
+ // if($this->request->getMethod() == 'post')
+ // {
+ // $model = new Receipt_model();
+ // $_POST['receipt_id'] = $receipt_id;
+ // $model->save($_POST);
+ // return redirect()->to(base_url()."/Dashboard/all_receipt");
+ // }
+ echo view('templates/header');
+ echo view('receipt_edit',$data);
echo view('templates/footer');
}
@@ -161,7 +220,7 @@ class Dashboard extends BaseController
$receipt_id=$receiptid;
$receipt_data=$rmodel->find($receipt_id);
$donorid = $receipt_data['donor_id'];
- $causeid = $receipt_data['cause_name'];
+ $causeid = $receipt_data['cause_id'];
// donation cause
$causemodel = new Donation_cause();
$cause_id=$causeid;
@@ -201,14 +260,13 @@ class Dashboard extends BaseController
$transactionData=[
'date' =>$this->request->getVar('date'),
'ref_1' =>$this->request->getVar('ref_1'),
- 'ref_2' =>$this->request->getVar('ref_2'),
'remarks' =>$this->request->getVar('remarks'),
'amount' =>$this->request->getVar('amount'),
'donation_ref' =>$this->request->getVar('donation_ref'),
];
$model->save($transactionData);
- return redirect()->to(base_url().'/Dashboard');
+ return redirect()->to(base_url().'/Dashboard/all_transaction');
}
public function all_transaction()
{
@@ -318,13 +376,23 @@ class Dashboard extends BaseController
{
return redirect()->to(base_url());
}
-
-
$data['donationcause']=$this->dcModel->all_donation_cause();
echo view('templates/header',$data);
echo view('add_donation_cause');
echo view('templates/footer');
}
+ public function all_donation_cause()
+ {
+ $data = [];
+ if(!session()->has('logged_user'))
+ {
+ return redirect()->to(base_url());
+ }
+ $data['donationcause']=$this->dcModel->all_donation_cause();
+ echo view('templates/header',$data);
+ echo view('all_donation_cause');
+ echo view('templates/footer');
+ }
public function add_donation_cause()
{
if(!session()->has('logged_user'))
@@ -332,11 +400,12 @@ class Dashboard extends BaseController
return redirect()->to(base_url());
}
$model = new Donation_cause();
+ $active="Active";
$donationCause=[
'cause_name' =>$this->request->getVar('cause_name'),
'from_date' =>$this->request->getVar('from_date'),
'to_date' =>$this->request->getVar('to_date'),
- 'status' =>1,
+ 'status' =>$active,
];
$model->save($donationCause);
return redirect()->to(base_url()."/Dashboard/donation_cause");
@@ -362,5 +431,43 @@ class Dashboard extends BaseController
echo view('donation_cause_edit');
echo view('templates/footer');
+ }
+ function inactive_cause($cause_id)
+ { $id = $cause_id;
+ $inactive="Inactive";
+ $donationCause=['status' =>$inactive,];
+ $model = new Donation_cause();
+ $model->update($id , $donationCause);
+ return redirect()->to(base_url()."/Dashboard/all_donation_cause");
+
+ }
+ function active_cause($cause_id)
+ { $id = $cause_id;
+ $active="Active";
+ $donationCause=['status' =>$active,];
+ $model = new Donation_cause();
+ $model->update($id , $donationCause);
+ return redirect()->to(base_url()."/Dashboard/all_donation_cause");
+
+ }
+
+ function donation_data_excel()
+ {
+ $validation = \Confic\Services::validation();
+ $valid=$this->validate(
+ [
+ 'fileimport' =>[
+ 'lable' => 'input file',
+ 'rules' => 'uploaded[fileimport]|ext_in[fileimport,xls & xlsx]',
+ 'errors' => [
+ 'uploaded' => '{field} error',
+ 'ext_in' => '{field} error excel',
+ ]
+ ]
+ ]
+ );
+
+
+
}
}
\ No newline at end of file
diff --git a/app/Controllers/Donor_controller.php b/app/Controllers/Donor_controller.php
index d853248..6f508b9 100644
--- a/app/Controllers/Donor_controller.php
+++ b/app/Controllers/Donor_controller.php
@@ -55,12 +55,14 @@ class Donor_controller extends BaseController
public function register()
{
- $data['country']=$this->Dashboard_model->fetch_country();
- helper(['form']);
+
+
+ $data['country']=$this->Dashboard_model->fetch_country();
+ helper(['form']);
if($this->request->getmethod() == 'post')
{
- // validate
+ //validate
$rules=[
'name' =>'required|min_length[3]|max_length[20]',
'phone' =>'required|min_length[3]|max_length[20]',
@@ -77,12 +79,30 @@ class Donor_controller extends BaseController
'gstin' =>'required|min_length[3]|max_length[20]',
'password' =>'required|min_length[8]|max_length[200]',
'password_confirm' =>'matches[password]',
+ //'userfile' => 'ext_in[fileimport,jpg & png]',image/jpg,image/jpeg,image/gif,
+ 'userfile' => [
+ 'uploaded[userfile]',
+ 'mime_in[userfile,image/png]',
+ 'max_size[userfile,1000]',
+ ],
+
];
if(! $this->validate($rules))
{
$data['validation'] = $this->validator;
}else{
+
+ $path="public/assets/uploads";
+ if($img = $this->request->getFile('userfile'))
+ {
+ if ($img->isValid() && ! $img->hasMoved())
+ {
+ $newName = $img->getRandomName();
+ $img->move($path, $newName);
+ $signature="public/assets/uploads/".$newName.".jpeg";
+ }
+ }
//store the donor in database
$model = new Donor_model();
$donorData=[
@@ -101,6 +121,8 @@ class Donor_controller extends BaseController
'gstin' =>$this->request->getVar('gstin'),
'foreign_key' =>$this->request->getVar('email'),
'password' =>$this->request->getVar('password'),
+ 'signature' =>$signature,
+
];
$model->save($donorData);
@@ -110,11 +132,12 @@ class Donor_controller extends BaseController
}
}
+
echo view('templates/header',$data);
echo view('register');
echo view('templates/footer');
- }
+ }
function fetch_country()
{
diff --git a/app/Controllers/PdfController.php b/app/Controllers/PdfController.php
index c8492c7..83d7529 100644
--- a/app/Controllers/PdfController.php
+++ b/app/Controllers/PdfController.php
@@ -39,7 +39,7 @@ class PdfController extends Controller
$receipt_id=$receiptid;
$receipt_data=$rmodel->find($receipt_id);
$donorid = $receipt_data['donor_id'];
- $causeid = $receipt_data['cause_name'];
+ $causeid = $receipt_data['cause_id'];
// donation cause
$causemodel = new Donation_cause();
$cause_id=$causeid;
@@ -50,12 +50,17 @@ class PdfController extends Controller
$Donor_data=$model->find($donor_id);
// array for receipt
$data= [ 'donordata'=>$Donor_data , 'admindata' =>$admin_data , 'receipt'=>$receipt_data , 'causedata'=>$cause_data];
-
+ //echo view('sample',$data); die();
+ $html = view('sample',$data);
$dompdf = new \Dompdf\Dompdf();
- $dompdf->loadHtml(view('download_receipt',$data));
+ //$dompdf->loadHtml(view('download_receipt',$data));
+ $dompdf->loadHtml($html);
$dompdf->setPaper('A4', 'portrait');
$dompdf->render();
$dompdf->stream();
+ $pdfContent = $dompdf->output();
+
+
}
diff --git a/app/Controllers/PhpspreadsheetController.php b/app/Controllers/PhpspreadsheetController.php
new file mode 100644
index 0000000..a0f9a89
--- /dev/null
+++ b/app/Controllers/PhpspreadsheetController.php
@@ -0,0 +1,246 @@
+session = session();
+ $this->Donation_data_model = new Donation_data_model();
+ $this->Transaction_model = new Transaction_model();
+
+ }
+
+public function import_donation_data()
+{
+
+
+ if($this->request->getmethod() == 'post')
+ {
+ //validate
+ $rules=[
+
+ 'upload_file' => [
+ 'rules'=>'uploaded[upload_file]|max_size[upload_file,1024]|ext_in[upload_file,xlsx]',
+ 'lable'=>'upload file'
+
+ ]
+
+ ];
+
+ if(! $this->validate($rules))
+ {
+ $data['validation'] = $this->validator;
+ }else{
+
+ $file= $this->request->getFile('upload_file');
+ //echo $file->getName();exit();
+ $ext=$file->getClientExtension();
+ if($ext == 'xls'){
+ $render = new \PhpOffice\PhpSpreadsheet\Reader\Xls();
+ } else {
+ $render = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
+ }
+ $spreadsheet = $render->load($file);
+ $allDataInSheet = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
+ $arrayCount = count($allDataInSheet);
+
+ $flag = 0;
+ $createArray = array('DATE', 'CAUSE_NAME', 'AMOUNT', 'PAYMENT_MODE' , 'REF' , 'DONATION_REF');
+
+ $makeArray = array('DATE' => 'DATE', 'CAUSE_NAME' => 'CAUSE_NAME', 'AMOUNT' => 'AMOUNT', 'PAYMENT_MODE' => 'PAYMENT_MODE', 'REF' => 'REF', 'DONATION_REF' => 'DONATION_REF');
+
+ $SheetDataKey = array();
+
+ foreach ($allDataInSheet as $dataInSheet) {
+ foreach ($dataInSheet as $key => $value) {
+
+ if (in_array(trim($value), $createArray)) {
+
+ $value = preg_replace('/\s+/', '', $value);
+ $SheetDataKey[trim($value)] = $key;
+
+ }
+
+ }
+
+ }
+ $dataDiff = array_diff_key($makeArray, $SheetDataKey);
+
+ if (empty($dataDiff)) {
+ $flag = 1;
+ }
+ // match excel sheet column
+ if ($flag == 1)
+ {
+ for ($i = 2; $i <= $arrayCount; $i++)
+ {
+
+ $date = $SheetDataKey['DATE'];
+ $cause_name = $SheetDataKey['CAUSE_NAME'];
+ $amount = $SheetDataKey['AMOUNT'];
+ $payment_mode = $SheetDataKey['PAYMENT_MODE'];
+ $ref = $SheetDataKey['REF'];
+ $donation_ref = $SheetDataKey['DONATION_REF'];
+
+
+ $date = filter_var(trim($allDataInSheet[$i][$date]), FILTER_SANITIZE_STRING);
+ $cause_name = filter_var(trim($allDataInSheet[$i][$cause_name]), FILTER_SANITIZE_STRING);
+ $amount = filter_var(trim($allDataInSheet[$i][$amount]), FILTER_SANITIZE_EMAIL);
+ $payment_mode = filter_var(trim($allDataInSheet[$i][$payment_mode]), FILTER_SANITIZE_STRING);
+ $ref = filter_var(trim($allDataInSheet[$i][$ref]), FILTER_SANITIZE_EMAIL);
+ $donation_ref = filter_var(trim($allDataInSheet[$i][$donation_ref]), FILTER_SANITIZE_STRING);
+
+ $fetchData= array('date' => $date, 'cause_name' => $cause_name, 'amount' => $amount, 'mode_of_payment' => $payment_mode, 'ref_1' => $ref, 'donation_ref' => $donation_ref);
+
+
+ $model = new Donation_data_model();
+ $model->save($fetchData);
+
+ }
+
+
+
+
+
+ } else {
+ echo '';
+ //echo "Please import correct file, did not match excel sheet column";
+ }
+
+
+ }
+ }
+ echo view('templates/header');
+ echo view('donation_data');
+ echo view('templates/footer');
+// $file_mimes = array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel', 'text/plain', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+
+// if(isset($_FILES['upload_file']['name']) && in_array($_FILES['upload_file']['type'], $file_mimes))
+// {
+// $arr_file = explode('.', $_FILES['upload_file']['name']);
+// $extension = end($arr_file);
+// if('csv' == $extension){
+// $reader = new \PhpOffice\PhpSpreadsheet\Reader\Csv();
+// } else {
+// $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
+// }
+// $spreadsheet = $reader->load($_FILES['upload_file']['tmp_name']);
+// $sheetData = $spreadsheet->getActiveSheet()->toArray();
+// echo "";
+// print_r($sheetData);
+// }
+}
+
+public function import_transaction_data()
+{
+
+
+ if($this->request->getmethod() == 'post')
+ {
+ //validate
+ $rules=[
+
+ 'transacton_upload' => [
+ 'rules'=>'uploaded[transacton_upload]|max_size[transacton_upload,1024]|ext_in[transacton_upload,xlsx]',
+ 'lable'=>'upload file'
+
+ ]
+
+ ];
+
+ if(! $this->validate($rules))
+ {
+ $data['validation'] = $this->validator;
+ }else{
+
+ $file= $this->request->getFile('transacton_upload');
+ //echo $file->getName();exit();
+ $ext=$file->getClientExtension();
+ if($ext == 'xls'){
+ $render = new \PhpOffice\PhpSpreadsheet\Reader\Xls();
+ } else {
+ $render = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
+ }
+ $spreadsheet = $render->load($file);
+ $allDataInSheet = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
+ $arrayCount = count($allDataInSheet);
+
+ $flag = 0;
+ $createArray = array('DATE', 'REF_1', 'REF_2', 'REMARKS' , 'AMOUNT' , 'DONATION_REF');
+
+ $makeArray = array('DATE' => 'DATE', 'REF_1' => 'REF_1', 'REF_2' => 'REF_2', 'REMARKS' => 'REMARKS', 'AMOUNT' => 'AMOUNT', 'DONATION_REF' => 'DONATION_REF');
+
+ $SheetDataKey = array();
+
+ foreach ($allDataInSheet as $dataInSheet) {
+ foreach ($dataInSheet as $key => $value) {
+
+ if (in_array(trim($value), $createArray)) {
+
+ $value = preg_replace('/\s+/', '', $value);
+ $SheetDataKey[trim($value)] = $key;
+
+ }
+
+ }
+
+ }
+ $dataDiff = array_diff_key($makeArray, $SheetDataKey);
+
+ if (empty($dataDiff)) {
+ $flag = 1;
+ }
+ // match excel sheet column
+ if ($flag == 1)
+ {
+ for ($i = 2; $i <= $arrayCount; $i++)
+ {
+
+ $date = $SheetDataKey['DATE'];
+ $ref_1 = $SheetDataKey['REF_1'];
+ $ref_2 = $SheetDataKey['REF_2'];
+ $remarks = $SheetDataKey['REMARKS'];
+ $amount = $SheetDataKey['AMOUNT'];
+ $donation_ref = $SheetDataKey['DONATION_REF'];
+
+
+ $date = filter_var(trim($allDataInSheet[$i][$date]), FILTER_SANITIZE_STRING);
+ $ref_1 = filter_var(trim($allDataInSheet[$i][$ref_1]), FILTER_SANITIZE_STRING);
+ $ref_2 = filter_var(trim($allDataInSheet[$i][$ref_2]), FILTER_SANITIZE_EMAIL);
+ $remarks = filter_var(trim($allDataInSheet[$i][$remarks]), FILTER_SANITIZE_STRING);
+ $amount = filter_var(trim($allDataInSheet[$i][$amount]), FILTER_SANITIZE_EMAIL);
+ $donation_ref = filter_var(trim($allDataInSheet[$i][$donation_ref]), FILTER_SANITIZE_STRING);
+
+ $fetchData= array('date' => $date, 'ref_1' => $ref_1, 'ref_2' => $ref_2, 'remarks' => $remarks, 'amount' => $amount, 'donation_ref' => $donation_ref);
+
+ //print_r($fetchData); exit();
+ $model = new Transaction_model();
+ $model->save($fetchData);
+
+ }
+
+ } else {
+ echo '';
+ //echo "Please import correct file, did not match excel sheet column";
+ }
+
+
+ }
+ }
+ echo view('templates/header');
+ echo view('transaction_upload');
+ echo view('templates/footer');
+
+}
+
+
+}
\ No newline at end of file
diff --git a/app/Controllers/Sendmail.php b/app/Controllers/Sendmail.php
index 89a4078..2e38817 100644
--- a/app/Controllers/Sendmail.php
+++ b/app/Controllers/Sendmail.php
@@ -9,10 +9,11 @@ class Sendmail extends Controller
{
return view('form_view');
}
- function Mail_to_donor() {
+ function Mail_to_donor()
+ {
- $to = 'gowthamceline46@gmail.com';
- $subject = 'Test';
+ $to = 'gowthamceline46@gmail.com';
+ $subject = "hai";
$message = 'CI4';
$email = \Config\Services::email();
diff --git a/app/Models/Donation_cause.php b/app/Models/Donation_cause.php
index f4710f3..4f671d2 100644
--- a/app/Models/Donation_cause.php
+++ b/app/Models/Donation_cause.php
@@ -13,15 +13,31 @@ class Donation_cause extends Model
function all_donation_cause()
{
$builder = $this->db->table('donation_cause');
- $builder->where('status',1);
+ // $builder->where('status','Active');
$result = $builder->get();
$output = $result->getResultArray();
return $output;
}
+function inactive_donation_cause()
+ {
+ $builder = $this->db->table('donation_cause');
+ $builder->where('status','Inactive');
+ $result = $builder->get();
+ $output = $result->getResultArray();
+ return $output;
+ }
+ // function inactive_cause($id)
+ // {
+ // $builder=$this->db->query("UPDATE donation_cause SET status = Inactive WHERE id = ".$id);
+ // }
+// function active_cause($id)
+ // {
+ // $builder=$this->db->query("UPDATE donation_cause SET status ='Active' WHERE id = ".$id);
+ // }
function fetch_cause_name()
{
$builder = $this->db->table('donation_cause');
- $builder->where('status',1);
+ $builder->where('status','Active');
$query = $builder->get();
$output = '';
foreach($query->getResult() as $row)
diff --git a/app/Models/Donor_model.php b/app/Models/Donor_model.php
index d2566ae..0115ab0 100644
--- a/app/Models/Donor_model.php
+++ b/app/Models/Donor_model.php
@@ -7,7 +7,7 @@ class Donor_model extends Model
protected $table = 'user_management';
protected $primaryKey = 'id';
- protected $allowedFields = ['name', 'phone','email','pan', 'address','country','state','city','pin_code','date_of_birth','gender', 'org_name','gstin','foreign_key', 'password','updated_at'];
+ protected $allowedFields = ['name', 'phone','email','pan', 'address','country','state','city','pin_code','date_of_birth','gender', 'org_name','gstin','foreign_key', 'password','signature','updated_at'];
protected $beforeInsert = ['beforeInsert'];
protected $beforeUpdate = ['beforeUpdate'];
diff --git a/app/Models/My_model.php b/app/Models/My_model.php
index 0dc0492..edfd228 100644
--- a/app/Models/My_model.php
+++ b/app/Models/My_model.php
@@ -31,6 +31,19 @@ function fetch_donor_id()
}
return $output;
}
+ function edit_donor_id()
+ {
+
+ $builder = $this->db->table('donar_management');
+ $query = $builder->get();
+ //print_r($query);die();
+ $output = '';
+ foreach($query->getResult() as $row)
+ {
+ $output .= '';
+ }
+ return $output;
+ }
// protected $returnType = 'array';
// protected $useSoftDeletes = true;
diff --git a/app/Models/Receipt_model.php b/app/Models/Receipt_model.php
index 654adf3..efb4629 100644
--- a/app/Models/Receipt_model.php
+++ b/app/Models/Receipt_model.php
@@ -6,7 +6,7 @@ class Receipt_model extends Model
{
protected $table = 'receipts';
protected $primaryKey = 'receipt_id';
- protected $allowedFields = ['receipt_no', 'date','donor_id','amount', 'mode_of_receipt','receipt_details','cause_name', 'remarks'];
+ protected $allowedFields = ['date','donor_id','donor_name','amount', 'mode_of_receipt','receipt_details','cause_id','cause_name', 'remarks'];
diff --git a/app/Views/add_donation_cause.php b/app/Views/add_donation_cause.php
index 1d5bb20..d01b21d 100644
--- a/app/Views/add_donation_cause.php
+++ b/app/Views/add_donation_cause.php
@@ -49,39 +49,4 @@
-
-
-
-
-
-
Donation Cause List
-
-
-
-
-
-
-
-
- | Cause Name |
- From Date |
- To Date |
- Action |
-
-
-
- |
- |
- |
-
- Edit |
-
-
-
-
-
-
-
-
diff --git a/app/Views/all_donation_cause.php b/app/Views/all_donation_cause.php
new file mode 100644
index 0000000..aff60da
--- /dev/null
+++ b/app/Views/all_donation_cause.php
@@ -0,0 +1,42 @@
+
+
+
+
+
+
Donation Cause List
+
+
+
+
+
+
+
+
+ | Cause Name |
+ From Date |
+ To Date |
+ status |
+ Action |
+
+
+
+
+ |
+ |
+ |
+ |
+
+ Deactive
+
+ | Activate
+
+ Edit |
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php
index 78b2d7b..c742d21 100644
--- a/app/Views/dashboard.php
+++ b/app/Views/dashboard.php
@@ -7,6 +7,7 @@
Mobile:phone;?>
Email :email;?>
Organization Name :org_name;?>
+send mail
diff --git a/app/Views/donation_data.php b/app/Views/donation_data.php
index a652677..70c94ea 100644
--- a/app/Views/donation_data.php
+++ b/app/Views/donation_data.php
@@ -6,62 +6,89 @@
-
Donation Date upload
+ Donation Data upload