diff --git a/.env b/.env index 39cd1db..13f6ad3 100644 --- a/.env +++ b/.env @@ -14,7 +14,7 @@ # ENVIRONMENT #-------------------------------------------------------------------- - CI_ENVIRONMENT = production +# CI_ENVIRONMENT = production #CI_ENVIRONMENT = development #LOCAL_FOLDER = 'donation' #-------------------------------------------------------------------- @@ -51,11 +51,11 @@ # DATABASE #-------------------------------------------------------------------- - 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.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 # database.tests.database = ci4 diff --git a/app/Controllers/PhpspreadsheetController.php b/app/Controllers/PhpspreadsheetController.php index d217d5b..3481b50 100644 --- a/app/Controllers/PhpspreadsheetController.php +++ b/app/Controllers/PhpspreadsheetController.php @@ -22,6 +22,10 @@ class PhpspreadsheetController extends BaseController public function import_donation_data() { + if(!session()->has('logged_user')) + { + return redirect()->to(base_url()); + } if($this->request->getmethod() == 'post') @@ -104,7 +108,7 @@ public function import_donation_data() $model = new Donation_data_model(); - $model->save($fetchData); + $model->save($fetchData); } @@ -120,30 +124,42 @@ public function import_donation_data() } } - 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'); + //return redirect()->to(base_url().'/all_donation_data'); + return view('donation_data'); +} -// if(isset($_FILES['upload_file']['name']) && in_array($_FILES['upload_file']['type'], $file_mimes)) + +// public function import_transaction_data() // { -// $arr_file = explode('.', $_FILES['upload_file']['name']); + // $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['transacton_upload']['name']) && in_array($_FILES['transacton_upload']['type'], $file_mimes)) +// { +// $arr_file = explode('.', $_FILES['transacton_upload']['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']); +// $spreadsheet = $reader->load($_FILES['transacton_upload']['tmp_name']); // $sheetData = $spreadsheet->getActiveSheet()->toArray(); -// echo "
";
+// if(!empty($sheetData))
+// {echo "
";
 // print_r($sheetData);
 // }
-}
+// }
+// }
+
+
+
 
 public function import_transaction_data()
 {
-
+     if(!session()->has('logged_user'))
+		{
+			return redirect()->to(base_url());
+		}
  
 	if($this->request->getmethod() == 'post')
 		{
@@ -174,7 +190,7 @@ public function import_transaction_data()
 		   $spreadsheet = $render->load($file);
 		   $allDataInSheet = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
 		    $arrayCount = count($allDataInSheet);
-
+  print_r($arrayCount);die();
                 $flag = 0;
                 $createArray = array('DATE', 'REF_1', 'REF_2', 'REMARKS' , 'AMOUNT' , 'DONATION_REF');
 
@@ -221,15 +237,13 @@ public function import_transaction_data()
 						$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);
+          $fetchData= array('date' => $date, 'ref_1' => $ref_1, 'ref_2' => $ref_2, 'remarks' => $remarks, 'amount' => $amount, 'donation_ref' => $donation_ref);
+					 // print_r($fetchData);
+					 $model = new Transaction_model();		 
+                     $model->save($fetchData);
 						
                     }
-					
-					 
+				
                 } else {
 					echo ''; 
                     //echo "Please import correct file, did not match excel sheet column";
@@ -240,19 +254,17 @@ public function import_transaction_data()
 			
 			
 		}
-		// echo view('templates/header');
-		// echo view('transaction_upload');
-		// echo view('templates/footer');
+		// return redirect()->to(base_url().'/all_transaction');
 		return view('transaction_upload');
 
 }
 	public function transaction_file()
 {
-	return $this->response->download('public/assets/download/transaction_upload_file.xlsx', NULL);
+	return $this->response->download('public/assets/download/transaction_data_file.xlsx', NULL);
 }
 	public function donation_data_file()
 {
-	return $this->response->download('public/assets/download/donation_data_upload_file.xlsx', NULL);
+	return $this->response->download('public/assets/download/donation_data_file.xlsx', NULL);
 }
 
 }
\ No newline at end of file
diff --git a/app/Views/donation_data.php b/app/Views/donation_data.php
index 6ecb3ff..4a9458b 100644
--- a/app/Views/donation_data.php
+++ b/app/Views/donation_data.php
@@ -178,7 +178,7 @@
                                                     
                                                   
                                                   
- +
diff --git a/app/Views/transaction_upload.php b/app/Views/transaction_upload.php index b293539..fe324a3 100644 --- a/app/Views/transaction_upload.php +++ b/app/Views/transaction_upload.php @@ -178,7 +178,7 @@
- +
diff --git a/public/assets/download/donation_data_file.xlsx b/public/assets/download/donation_data_file.xlsx new file mode 100644 index 0000000..cdcf290 Binary files /dev/null and b/public/assets/download/donation_data_file.xlsx differ diff --git a/public/assets/download/transaction_data_file.xlsx b/public/assets/download/transaction_data_file.xlsx new file mode 100644 index 0000000..513420e Binary files /dev/null and b/public/assets/download/transaction_data_file.xlsx differ diff --git a/writable/session/ci_session0509254eff83mhh6fj2892lt8gami4vj b/writable/session/ci_session0509254eff83mhh6fj2892lt8gami4vj new file mode 100644 index 0000000..b2e9a9e --- /dev/null +++ b/writable/session/ci_session0509254eff83mhh6fj2892lt8gami4vj @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609737788;_ci_previous_url|s:37:"http://localhost/donation/transaction";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_session0o04a9al6lnn16rmrou173v0g4odofae b/writable/session/ci_session0o04a9al6lnn16rmrou173v0g4odofae new file mode 100644 index 0000000..efbf7f7 --- /dev/null +++ b/writable/session/ci_session0o04a9al6lnn16rmrou173v0g4odofae @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609687940;_ci_previous_url|s:48:"http://localhost/donation/transaction_data_excel";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_session0p7fouhke6po3pcskebkf1ae0h8kvk6d b/writable/session/ci_session0p7fouhke6po3pcskebkf1ae0h8kvk6d new file mode 100644 index 0000000..8ab0d46 --- /dev/null +++ b/writable/session/ci_session0p7fouhke6po3pcskebkf1ae0h8kvk6d @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609686091;_ci_previous_url|s:48:"http://localhost/donation/transaction_data_excel";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_session30enjvtack7in0b1jpkvk9b6f4hfd1pn b/writable/session/ci_session30enjvtack7in0b1jpkvk9b6f4hfd1pn new file mode 100644 index 0000000..a100ebf --- /dev/null +++ b/writable/session/ci_session30enjvtack7in0b1jpkvk9b6f4hfd1pn @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609686925;_ci_previous_url|s:48:"http://localhost/donation/transaction_data_excel";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_session42nkg1op1gsnvmqsaveqlgiun8sj24tg b/writable/session/ci_session42nkg1op1gsnvmqsaveqlgiun8sj24tg new file mode 100644 index 0000000..dc46d39 --- /dev/null +++ b/writable/session/ci_session42nkg1op1gsnvmqsaveqlgiun8sj24tg @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609739191;_ci_previous_url|s:37:"http://localhost/donation/transaction";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_session60v46tjjkrco1d1legllmbj6r8oso0hi b/writable/session/ci_session60v46tjjkrco1d1legllmbj6r8oso0hi new file mode 100644 index 0000000..c63c821 --- /dev/null +++ b/writable/session/ci_session60v46tjjkrco1d1legllmbj6r8oso0hi @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609689504;_ci_previous_url|s:37:"http://localhost/donation/transaction";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_session67q0qgmro7fr8g2r7slpmv373kbjnekb b/writable/session/ci_session67q0qgmro7fr8g2r7slpmv373kbjnekb new file mode 100644 index 0000000..6c8b925 --- /dev/null +++ b/writable/session/ci_session67q0qgmro7fr8g2r7slpmv373kbjnekb @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609741473;_ci_previous_url|s:37:"http://localhost/donation/transaction";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_session7slvh1l971e3uleu5mhjdn6971g9vh0b b/writable/session/ci_session7slvh1l971e3uleu5mhjdn6971g9vh0b new file mode 100644 index 0000000..3c66ad5 --- /dev/null +++ b/writable/session/ci_session7slvh1l971e3uleu5mhjdn6971g9vh0b @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609689540;_ci_previous_url|s:26:"http://localhost/donation/"; \ No newline at end of file diff --git a/writable/session/ci_session8ee5nbr1n18mra7fd0224gak8uhgahc8 b/writable/session/ci_session8ee5nbr1n18mra7fd0224gak8uhgahc8 new file mode 100644 index 0000000..1ad60d4 --- /dev/null +++ b/writable/session/ci_session8ee5nbr1n18mra7fd0224gak8uhgahc8 @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609683949;_ci_previous_url|s:42:"http://localhost/donation/transaction_file";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_session9jlj9g0onu0kkt797o1svq4s121hndrr b/writable/session/ci_session9jlj9g0onu0kkt797o1svq4s121hndrr new file mode 100644 index 0000000..d7b74a1 --- /dev/null +++ b/writable/session/ci_session9jlj9g0onu0kkt797o1svq4s121hndrr @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609684809;_ci_previous_url|s:43:"http://localhost/donation/all_donation_data";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_sessioncs3j2ocbu3jqvmoscli586n3erhjnf16 b/writable/session/ci_sessioncs3j2ocbu3jqvmoscli586n3erhjnf16 new file mode 100644 index 0000000..39283f0 --- /dev/null +++ b/writable/session/ci_sessioncs3j2ocbu3jqvmoscli586n3erhjnf16 @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609603328;_ci_previous_url|s:26:"http://localhost/donation/"; \ No newline at end of file diff --git a/writable/session/ci_sessiondhod0dpt650r07ilklsfrc4buleahlhl b/writable/session/ci_sessiondhod0dpt650r07ilklsfrc4buleahlhl new file mode 100644 index 0000000..10e3b18 --- /dev/null +++ b/writable/session/ci_sessiondhod0dpt650r07ilklsfrc4buleahlhl @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609739589;_ci_previous_url|s:37:"http://localhost/donation/transaction";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_sessiondnt67jsdfgji0n9ktub64gqnh6hoc3l2 b/writable/session/ci_sessiondnt67jsdfgji0n9ktub64gqnh6hoc3l2 new file mode 100644 index 0000000..afc9898 --- /dev/null +++ b/writable/session/ci_sessiondnt67jsdfgji0n9ktub64gqnh6hoc3l2 @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609686583;_ci_previous_url|s:48:"http://localhost/donation/transaction_data_excel";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_sessionf7icl6eri7pehg7svcheidi9iqnfo619 b/writable/session/ci_sessionf7icl6eri7pehg7svcheidi9iqnfo619 new file mode 100644 index 0000000..7cd8cd0 --- /dev/null +++ b/writable/session/ci_sessionf7icl6eri7pehg7svcheidi9iqnfo619 @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609739958;_ci_previous_url|s:48:"http://localhost/donation/transaction_data_excel";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_sessionfvcmml6q08m25sl316q6dddin59sfjm5 b/writable/session/ci_sessionfvcmml6q08m25sl316q6dddin59sfjm5 new file mode 100644 index 0000000..8b574f1 --- /dev/null +++ b/writable/session/ci_sessionfvcmml6q08m25sl316q6dddin59sfjm5 @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609684357;_ci_previous_url|s:39:"http://localhost/donation/donation_data";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_sessiongq1pel6j3l28lr3gpjihkv9ef0d0neur b/writable/session/ci_sessiongq1pel6j3l28lr3gpjihkv9ef0d0neur index 6b4a3ac..52defc5 100644 --- a/writable/session/ci_sessiongq1pel6j3l28lr3gpjihkv9ef0d0neur +++ b/writable/session/ci_sessiongq1pel6j3l28lr3gpjihkv9ef0d0neur @@ -1 +1 @@ -__ci_last_regenerate|i:1609602427;_ci_previous_url|s:32:"http://localhost/donation/signup"; \ No newline at end of file +__ci_last_regenerate|i:1609603328;_ci_previous_url|s:32:"http://localhost/donation/signup"; \ No newline at end of file diff --git a/writable/session/ci_sessionjg3a8i0emo9g8uetf8uktdnt3fhp2r8t b/writable/session/ci_sessionjg3a8i0emo9g8uetf8uktdnt3fhp2r8t new file mode 100644 index 0000000..fae7c2d --- /dev/null +++ b/writable/session/ci_sessionjg3a8i0emo9g8uetf8uktdnt3fhp2r8t @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609738356;_ci_previous_url|s:37:"http://localhost/donation/transaction";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_sessionnvvfuai3ds9qk14uk2s1l3h2nef0n2pr b/writable/session/ci_sessionnvvfuai3ds9qk14uk2s1l3h2nef0n2pr new file mode 100644 index 0000000..a29d26c --- /dev/null +++ b/writable/session/ci_sessionnvvfuai3ds9qk14uk2s1l3h2nef0n2pr @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609685637;_ci_previous_url|s:37:"http://localhost/donation/transaction";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_sessionovvubpn6j9dfsee49m67t53ra7uunpgd b/writable/session/ci_sessionovvubpn6j9dfsee49m67t53ra7uunpgd new file mode 100644 index 0000000..b9d2471 --- /dev/null +++ b/writable/session/ci_sessionovvubpn6j9dfsee49m67t53ra7uunpgd @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609741474;_ci_previous_url|s:32:"http://localhost/donation/signup"; \ No newline at end of file diff --git a/writable/session/ci_sessionrv5l8lglrr8vu5sauviq118krq6hjq9a b/writable/session/ci_sessionrv5l8lglrr8vu5sauviq118krq6hjq9a new file mode 100644 index 0000000..7c8c31f --- /dev/null +++ b/writable/session/ci_sessionrv5l8lglrr8vu5sauviq118krq6hjq9a @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609737333;_ci_previous_url|s:48:"http://localhost/donation/transaction_data_excel";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_sessionujr4km5ivuhtbpppb0cd993mq37pkets b/writable/session/ci_sessionujr4km5ivuhtbpppb0cd993mq37pkets new file mode 100644 index 0000000..4d4704c --- /dev/null +++ b/writable/session/ci_sessionujr4km5ivuhtbpppb0cd993mq37pkets @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609687516;_ci_previous_url|s:48:"http://localhost/donation/transaction_data_excel";logged_user|s:1:"3"; \ No newline at end of file diff --git a/writable/session/ci_sessionuri2rmdmnpbttkfa40f0e6f2e7tigm58 b/writable/session/ci_sessionuri2rmdmnpbttkfa40f0e6f2e7tigm58 new file mode 100644 index 0000000..ef42d79 --- /dev/null +++ b/writable/session/ci_sessionuri2rmdmnpbttkfa40f0e6f2e7tigm58 @@ -0,0 +1 @@ +__ci_last_regenerate|i:1609685235;_ci_previous_url|s:48:"http://localhost/donation/transaction_data_excel";logged_user|s:1:"3"; \ No newline at end of file