+
+ +
diff --git a/.env b/.env index 95276f3..acebdb3 100644 --- a/.env +++ b/.env @@ -49,10 +49,10 @@ # DATABASE #-------------------------------------------------------------------- - database.default.hostname = localhost - database.default.database = donation - database.default.username = root - database.default.password = + database.default.hostname = venbainfotech.com + database.default.database = kasirama_donr + database.default.username = kasirama_donr + database.default.password = gx2BEG=qc+D0 database.default.DBDriver = MySQLi # database.tests.hostname = localhost diff --git a/app/Config/Database.php b/app/Config/Database.php index b31541a..9752db6 100644 --- a/app/Config/Database.php +++ b/app/Config/Database.php @@ -31,10 +31,10 @@ class Database extends \CodeIgniter\Database\Config */ public $default = [ 'DSN' => '', - 'hostname' => 'localhost', - 'username' => '', - 'password' => '', - 'database' => '', + 'hostname' => 'venbainfotech.com', + 'username' => 'kasirama_donr', + 'password' => 'gx2BEG=qc+D0', + 'database' => 'kasirama_donr', 'DBDriver' => 'MySQLi', 'DBPrefix' => '', 'pConnect' => false, diff --git a/app/Config/Routes.php b/app/Config/Routes.php index f957dbb..d836adb 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -31,6 +31,28 @@ $routes->setAutoRoute(true); // We get a performance increase by specifying the default // route since we don't have to scan directories. $routes->get('/', 'Donor_controller::index'); +$routes->match(['get','post'],'donor_register','My_controller::donor_register'); +$routes->match(['get','post'],'all_donor','My_controller::all_donor'); +$routes->match(['get','post'],'receipts','Dashboard::receipts'); +$routes->match(['get','post'],'all_receipt','Dashboard::all_receipt'); +$routes->match(['get','post'],'all_transaction','Dashboard::all_transaction'); +$routes->match(['get','post'],'transaction','Dashboard::transaction'); +$routes->match(['get','post'],'donation_data','Dashboard::donation_data'); +$routes->match(['get','post'],'all_donation_data','Dashboard::all_donation_data'); +$routes->match(['get','post'],'donation_cause','Dashboard::donation_cause'); +$routes->match(['get','post'],'all_donation_cause','Dashboard::all_donation_cause'); + + + +//$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_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'],'login','Donor_controller::login'); $routes->match(['get'],'fetch_country','Donor_controller::fetch_country'); @@ -54,6 +76,11 @@ $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->match(['get','post'],'transaction_file','PhpspreadsheetController::transaction_file'); +$routes->match(['get','post'],'donation_data_file','PhpspreadsheetController::donation_data_file'); + +$routes->add('logout','Dashboard::logout'); // $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 cfacec9..2b108f1 100644 --- a/app/Controllers/Dashboard.php +++ b/app/Controllers/Dashboard.php @@ -31,9 +31,10 @@ class Dashboard extends BaseController $id= session()->get('logged_user'); $data['userdata']=$this->dModel->getLoggedInUserData($id); - echo view('templates/header',$data); - echo view('dashboard'); - echo view('templates/footer'); + // echo view('templates/header',$data); + // echo view('dashboard'); + // echo view('templates/footer'); + return view('dashboard'); } public function logout() { @@ -65,10 +66,10 @@ class Dashboard extends BaseController } $name= session()->get('logged_user'); - - echo view('templates/header'); - echo view('receipts'); - echo view('templates/footer'); + return view('receipts'); + // echo view('templates/header'); + // echo view('receipts'); + // echo view('templates/footer'); } @@ -101,10 +102,12 @@ class Dashboard extends BaseController 'cause_name' =>$cause_name, 'remarks' =>$this->request->getVar('remarks'), ]; + //print_r($receiptData);die(); $model = new Receipt_model(); $model->save($receiptData); return redirect()->to(base_url().'/Dashboard/last_receipt'); } + function update_receipt() { if(!session()->has('logged_user')) @@ -138,7 +141,7 @@ class Dashboard extends BaseController ]; $model = new Receipt_model(); $model->update($receipt_id , $receiptData); - return redirect()->to(base_url().'/Dashboard/all_receipt'); + return redirect()->to(base_url().'/all_receipt'); } @@ -150,9 +153,9 @@ class Dashboard extends BaseController return redirect()->to(base_url()); } $data['receiptdata']=$this->rModel->all_receipt(); - echo view('templates/header',$data); - echo view('receipts_table'); - echo view('templates/footer'); + + return view('receipts_table',$data); + } function edit_receipt($receipt_id) @@ -178,9 +181,9 @@ class Dashboard extends BaseController // $model->save($_POST); // return redirect()->to(base_url()."/Dashboard/all_receipt"); // } - echo view('templates/header'); - echo view('receipt_edit',$data); - echo view('templates/footer'); + + return view('receipt_edit',$data); + } function last_receipt() @@ -232,10 +235,11 @@ class Dashboard extends BaseController // array for receipt $data= [ 'donordata'=>$Donor_data , 'admindata' =>$admin_data , 'receipt'=>$receipt_data , 'causedata'=>$cause_data]; - echo view('templates/header'); - echo view('view_receipt',$data); - echo view('templates/footer'); + + return view('receipt_view',$data); + } + public function transaction() { $data = []; @@ -246,28 +250,28 @@ class Dashboard extends BaseController $name= session()->get('logged_user'); //$data['userdata']=$this->dModel->getLoggedInUserData($name); - echo view('templates/header'); - echo view('transaction_upload'); - echo view('templates/footer'); + + return view('transaction_upload'); + } - public function transaction_upload() - { - if(!session()->has('logged_user')) - { - return redirect()->to(base_url()); - } - $model = new Transaction_model(); - $transactionData=[ - 'date' =>$this->request->getVar('date'), - 'ref_1' =>$this->request->getVar('ref_1'), - 'remarks' =>$this->request->getVar('remarks'), - 'amount' =>$this->request->getVar('amount'), - 'donation_ref' =>$this->request->getVar('donation_ref'), + // public function transaction_upload() + // { + // if(!session()->has('logged_user')) + // { + // return redirect()->to(base_url()); + // } + // $model = new Transaction_model(); + // $transactionData=[ + // 'date' =>$this->request->getVar('date'), + // 'ref_1' =>$this->request->getVar('ref_1'), + // '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/all_transaction'); - } + // ]; + // $model->save($transactionData); + // return redirect()->to(base_url().'/Dashboard/all_transaction'); + // } public function all_transaction() { $data = []; @@ -278,9 +282,9 @@ class Dashboard extends BaseController $data['receiptdata']=$this->tModel->all_transaction(); - echo view('templates/header',$data); - echo view('transaction_table'); - echo view('templates/footer'); + + return view('transaction_table',$data); + } function edit_transaction($id) { @@ -297,13 +301,16 @@ class Dashboard extends BaseController $model = new Transaction_model(); $_POST['id'] = $id; $model->save($_POST); - return redirect()->to(base_url()."/Dashboard/all_transaction"); + return redirect()->to(base_url()."/all_transaction"); } - echo view('templates/header',$data); - echo view('transaction_edit'); - echo view('templates/footer'); + + return view('transaction_edit',$data); + } + + + public function donation_data() { $data = []; @@ -311,28 +318,28 @@ class Dashboard extends BaseController { return redirect()->to(base_url()); } - echo view('templates/header'); - echo view('donation_data'); - echo view('templates/footer'); - } - public function donation_data_upload() - { - if(!session()->has('logged_user')) - { - return redirect()->to(base_url()); - } - $model = new Donation_data_model(); - $donationData=[ - 'date' =>$this->request->getVar('date'), - 'cause_name' =>$this->request->getVar('cause_name'), - 'amount' =>$this->request->getVar('amount'), - 'mode_of_payment' =>$this->request->getVar('mode_of_payment'), - 'ref_1' =>$this->request->getVar('ref_1'), - 'donation_ref' =>$this->request->getVar('donation_ref'), - ]; - $model->save($donationData); - return redirect()->to(base_url().'/Dashboard'); + + return view('donation_data'); + } + // public function donation_data_upload() + // { + // if(!session()->has('logged_user')) + // { + // return redirect()->to(base_url()); + // } + // $model = new Donation_data_model(); + // $donationData=[ + // 'date' =>$this->request->getVar('date'), + // 'cause_name' =>$this->request->getVar('cause_name'), + // 'amount' =>$this->request->getVar('amount'), + // 'mode_of_payment' =>$this->request->getVar('mode_of_payment'), + // 'ref_1' =>$this->request->getVar('ref_1'), + // 'donation_ref' =>$this->request->getVar('donation_ref'), + // ]; + // $model->save($donationData); + // return redirect()->to(base_url().'/Dashboard'); + // } public function all_donation_data() { $data = []; @@ -343,9 +350,9 @@ class Dashboard extends BaseController $data['donationdata']=$this->ddModel->all_donation_data(); - echo view('templates/header',$data); - echo view('donation_data_table'); - echo view('templates/footer'); + + return view('donation_data_table',$data); + } function edit_donation_data($id) { @@ -362,11 +369,11 @@ class Dashboard extends BaseController $model = new Donation_data_model(); $_POST['id'] = $id; $model->save($_POST); - return redirect()->to(base_url()."/Dashboard/all_donation_data"); + return redirect()->to(base_url()."/all_donation_data"); } - echo view('templates/header',$data); - echo view('donation_data_edit'); - echo view('templates/footer'); + + return view('donation_data_edit',$data); + } public function donation_cause() @@ -377,9 +384,9 @@ 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'); + + return view('add_donation_cause'); + } public function all_donation_cause() { @@ -389,9 +396,9 @@ class Dashboard extends BaseController 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'); + + return view('all_donation_cause',$data); + } public function add_donation_cause() { @@ -425,11 +432,11 @@ class Dashboard extends BaseController $model = new Donation_cause(); $_POST['id'] = $id; $model->save($_POST); - return redirect()->to(base_url()."/Dashboard/donation_cause"); + return redirect()->to(base_url()."/all_donation_cause"); } - echo view('templates/header',$data); - echo view('donation_cause_edit'); - echo view('templates/footer'); + + return view('donation_cause_edit',$data); + } function inactive_cause($cause_id) @@ -438,7 +445,7 @@ class Dashboard extends BaseController $donationCause=['status' =>$inactive,]; $model = new Donation_cause(); $model->update($id , $donationCause); - return redirect()->to(base_url()."/Dashboard/all_donation_cause"); + return redirect()->to(base_url()."/all_donation_cause"); } function active_cause($cause_id) @@ -447,27 +454,9 @@ class Dashboard extends BaseController $donationCause=['status' =>$active,]; $model = new Donation_cause(); $model->update($id , $donationCause); - return redirect()->to(base_url()."/Dashboard/all_donation_cause"); + return redirect()->to(base_url()."/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 6f508b9..54ee487 100644 --- a/app/Controllers/Donor_controller.php +++ b/app/Controllers/Donor_controller.php @@ -2,7 +2,7 @@ use App\Models\Donor_model; use App\Models\Dashboard_model; - +use App\Models\Address_model; class Donor_controller extends BaseController { @@ -34,19 +34,19 @@ class Donor_controller extends BaseController } else{ $this->session->setTempdata('error','sorry wrong password entered for the Email',3); - return redirect()->to(current_url()); + return redirect()->to(base_url().'/Donor_controller'); } }else { $this->session->setTempdata('error','sorry Email does not existe',3); - return redirect()->to(current_url()); + return redirect()->to(base_url().'/Donor_controller'); } } - echo view('templates/header',$data); - echo view('login'); - echo view('templates/footer'); + //echo view('templates/header',$data); + return view('login'); + //echo view('templates/footer'); //return view('donor_registration'); } @@ -64,14 +64,14 @@ class Donor_controller extends BaseController { //validate $rules=[ - 'name' =>'required|min_length[3]|max_length[20]', - 'phone' =>'required|min_length[3]|max_length[20]', + 'name' =>'required|min_length[3]|max_length[30]', + 'phone' =>'required|min_length[3]|max_length[10]', 'email' =>'required|min_length[6]|max_length[50]|valid_email|is_unique[donar_management.email]', 'pan' =>'required|min_length[3]|max_length[20]', - 'address' =>'required|min_length[3]|max_length[20]', - 'country' =>'required', - 'state' =>'required', - 'city' =>'required', + 'address' =>'required|min_length[3]|max_length[70]', + // 'country' =>'required', + // 'state' =>'required', + // 'city' =>'required', 'pin_code' =>'required|min_length[6]|max_length[6]', 'date_of_birth' =>'required|min_length[3]|max_length[20]', 'gender' =>'required|min_length[3]|max_length[20]', @@ -82,7 +82,7 @@ class Donor_controller extends BaseController //'userfile' => 'ext_in[fileimport,jpg & png]',image/jpg,image/jpeg,image/gif, 'userfile' => [ 'uploaded[userfile]', - 'mime_in[userfile,image/png]', + //'mime_in[avatar,image/jpg,image/jpeg,image/gif,image/png]', 'max_size[userfile,1000]', ], @@ -93,6 +93,23 @@ class Donor_controller extends BaseController $data['validation'] = $this->validator; }else{ + + $Address_model = new Address_model(); + + $country_id=$this->request->getVar('country'); + $state_id=$this->request->getVar('state'); + $city_id=$this->request->getVar('city'); + + $country_name=$Address_model->country($country_id); + foreach($country_name as $key){ $key['country_name']; } + $country=$key['country_name']; + $state_name=$Address_model->state($state_id); + foreach($state_name as $key){ $key['state_name']; } + $state=$key['state_name']; + $city_name=$Address_model->city($city_id); + foreach($city_name as $key){ $key['city_name']; } + $city=$key['city_name']; + $path="public/assets/uploads"; if($img = $this->request->getFile('userfile')) { @@ -100,7 +117,7 @@ class Donor_controller extends BaseController { $newName = $img->getRandomName(); $img->move($path, $newName); - $signature="public/assets/uploads/".$newName.".jpeg"; + $signature="public/assets/uploads/".$newName; } } //store the donor in database @@ -111,9 +128,9 @@ class Donor_controller extends BaseController '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'), + 'country' =>$country, + 'state' =>$state, + 'city' =>$city, 'pin_code' =>$this->request->getVar('pin_code'), 'date_of_birth' =>$this->request->getVar('date_of_birth'), 'gender' =>$this->request->getVar('gender'), @@ -122,9 +139,8 @@ class Donor_controller extends BaseController 'foreign_key' =>$this->request->getVar('email'), 'password' =>$this->request->getVar('password'), 'signature' =>$signature, - - ]; + //print_r($donorData);die(); $model->save($donorData); $session = session(); $session ->setFlashdata('success','Successful Registration'); @@ -133,9 +149,9 @@ class Donor_controller extends BaseController } - echo view('templates/header',$data); - echo view('register'); - echo view('templates/footer'); + //echo view('templates/header',$data); + return view('register',$data); + //echo view('templates/footer'); } diff --git a/app/Controllers/My_controller.php b/app/Controllers/My_controller.php index 1df7f27..45a533e 100644 --- a/app/Controllers/My_controller.php +++ b/app/Controllers/My_controller.php @@ -2,7 +2,7 @@ use App\Models\My_model; use App\Models\Dashboard_model; - +use App\Models\Address_model; class My_controller extends BaseController { @@ -28,10 +28,10 @@ class My_controller extends BaseController // validate $rules=[ 'name' =>'required|min_length[3]|max_length[20]', - 'phone' =>'required|min_length[3]|max_length[20]', + 'phone' =>'required|min_length[3]|max_length[10]', 'email' =>'required|min_length[6]|max_length[50]|valid_email|is_unique[donar_management.email]', 'pan' =>'required|min_length[3]|max_length[20]', - 'address' =>'required|min_length[3]|max_length[20]', + 'address' =>'required|min_length[3]|max_length[70]', 'country' =>'required', 'state' =>'required', 'city' =>'required', @@ -46,8 +46,24 @@ class My_controller extends BaseController if(! $this->validate($rules)) { $data['validation'] = $this->validator; + //echo ''; }else{ - //store the donor in database + $Address_model = new Address_model(); + + $country_id=$this->request->getVar('country'); + $state_id=$this->request->getVar('state'); + $city_id=$this->request->getVar('city'); + + $country_name=$Address_model->country($country_id); + foreach($country_name as $key){ $key['country_name']; } + $country=$key['country_name']; + $state_name=$Address_model->state($state_id); + foreach($state_name as $key){ $key['state_name']; } + $state=$key['state_name']; + $city_name=$Address_model->city($city_id); + foreach($city_name as $key){ $key['city_name']; } + $city=$key['city_name']; + $model = new My_model(); $donorData=[ 'name' =>$this->request->getVar('name'), @@ -55,9 +71,9 @@ class My_controller extends BaseController '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'), + 'country' =>$country, + 'state' =>$state, + 'city' =>$city, 'pin_code' =>$this->request->getVar('pin_code'), 'date_of_birth' =>$this->request->getVar('date_of_birth'), 'gender' =>$this->request->getVar('gender'), @@ -66,6 +82,7 @@ class My_controller extends BaseController ]; + //print_r($donorData); die(); $model->save($donorData); $session = session(); $session ->setFlashdata('success','Successful Registration'); @@ -73,9 +90,9 @@ class My_controller extends BaseController } } - echo view('templates/header',$data); - echo view('donor_registration'); - echo view('templates/footer'); + // echo view('templates/header',$data); + return view('donor_registration'); + // echo view('templates/footer'); } @@ -89,9 +106,9 @@ class My_controller extends BaseController $data['receiptdata']=$this->My_model->all_donor(); - echo view('templates/header',$data); - echo view('donor_table'); - echo view('templates/footer'); + + return view('donor_table',$data); + } function edit_donor($id) { @@ -104,11 +121,9 @@ class My_controller extends BaseController $model = new My_model(); $_POST['id'] = $id; $model->save($_POST); - return redirect()->to(base_url()."/My_controller/all_donor"); + return redirect()->to(base_url()."/all_donor"); } - echo view('templates/header',$data); - echo view('donor_edit'); - echo view('templates/footer'); + return view('donor_edit',$data); } diff --git a/app/Controllers/PdfController.php b/app/Controllers/PdfController.php index 83d7529..f136f48 100644 --- a/app/Controllers/PdfController.php +++ b/app/Controllers/PdfController.php @@ -50,8 +50,8 @@ 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); + //echo view('download_receipt',$data); die(); + $html = view('download_receipt',$data); $dompdf = new \Dompdf\Dompdf(); //$dompdf->loadHtml(view('download_receipt',$data)); $dompdf->loadHtml($html); diff --git a/app/Controllers/PhpspreadsheetController.php b/app/Controllers/PhpspreadsheetController.php index a0f9a89..d217d5b 100644 --- a/app/Controllers/PhpspreadsheetController.php +++ b/app/Controllers/PhpspreadsheetController.php @@ -13,6 +13,7 @@ class PhpspreadsheetController extends BaseController public $session; public function __construct() { + helper('filesystem'); $this->session = session(); $this->Donation_data_model = new Donation_data_model(); $this->Transaction_model = new Transaction_model(); @@ -227,6 +228,7 @@ public function import_transaction_data() $model->save($fetchData); } + } else { echo ''; @@ -235,12 +237,22 @@ public function import_transaction_data() } + + } - echo view('templates/header'); - echo view('transaction_upload'); - echo view('templates/footer'); + // echo view('templates/header'); + // echo view('transaction_upload'); + // echo view('templates/footer'); + return view('transaction_upload'); } - - + public function transaction_file() +{ + return $this->response->download('public/assets/download/transaction_upload_file.xlsx', NULL); +} + public function donation_data_file() +{ + return $this->response->download('public/assets/download/donation_data_upload_file.xlsx', NULL); +} + } \ No newline at end of file diff --git a/app/Models/Address_model.php b/app/Models/Address_model.php new file mode 100644 index 0000000..eb2b470 --- /dev/null +++ b/app/Models/Address_model.php @@ -0,0 +1,64 @@ +db->table('donation_cause'); + // $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 country($id) + { + $builder=$this->db->query("SELECT country_name FROM country WHERE country_id = ".$id); + $output = $builder->getResultArray(); + return $output; + } + function state($id) + { + $builder=$this->db->query("SELECT state_name FROM state WHERE state_id = ".$id); + $output = $builder->getResultArray(); + return $output; + } + function city($id) + { + $builder=$this->db->query("SELECT city_name FROM city WHERE city_id = ".$id); + $output = $builder->getResultArray(); + return $output; + } +// 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','Active'); + $query = $builder->get(); + $output = ''; + foreach($query->getResult() as $row) + { + $output .= ''; + } + return $output; + } + + + +} \ No newline at end of file diff --git a/app/Views/add_donation_cause.php b/app/Views/add_donation_cause.php index d01b21d..b5f86c7 100644 --- a/app/Views/add_donation_cause.php +++ b/app/Views/add_donation_cause.php @@ -1,52 +1,254 @@ -