+ Cancel Credit Request

application/controllers/Hyperviseur_dash.php

@@ -677,7 +677,6 @@ class Hyperviseur_dash extends CI_Controller
 			if (isset($_POST)) {
 				$id_demand = $_POST['id_demand'];
 				$res = $this->user_model->cancelCreditRequest($id_demand);
-
 				if ($res) {
 					echo json_encode("200");
 				} else {

application/controllers/Superviseur_dash.php

@@ -218,6 +218,9 @@ class Superviseur_dash extends CI_Controller
 			$agent_id = $this->session->userdata('agent_id');
 			$data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id'));
 
+			if ($this->input->get('history')) {
+				$this->historique($id_network, $this->input->get('d'), $this->input->get('f'), $this->session->userdata('member_code'));
+			} else {
 				//Create wallet if it not exist
 				$res = $this->user_model->getWallet($agent_id );
 				if($res == false){
@@ -278,7 +281,35 @@ class Superviseur_dash extends CI_Controller
 				$this->load->view('header_sup',$data);
 				$this->load->view('gestion_wallet_sup');
 				$this->load->view('footer');
+			}
 
 		}
 	}
+
+	private function historique($network_id, $startDate, $endDate, $codeMembre)
+	{
+		$data['configWallet'] = $this->user_model->getConfigWallet($network_id);
+		$format = $this->session->userdata('site_lang') === 'french' ? 'd-m-Y' : 'Y-m-d';
+		$data['startDate'] = $startDate ? date($format, strtotime($startDate)) : null;
+		$data['endDate'] = $endDate ? date($format, strtotime($endDate)) : null;
+		$endDate = Date('Y-m-d', strtotime($endDate . "+1 day"));
+		$data['transactions'] = $this->user_model->getTransactionsSup($startDate, $endDate, $codeMembre);
+
+		$data['active'] = "wallet";
+		$data['alert'] = "";
+		$data['firstname'] = $this->session->userdata('firstname');
+		$data['lastname'] = $this->session->userdata('lastname');
+		$data['email'] = $this->session->userdata('email');
+		$data['network'] = $this->session->userdata('network');
+		$data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays'));
+		$data['networks'] = $this->user_model->getActiveNetwork();
+		$data['superviseurs'] = $this->user_model->getSuperNameAndCodeForHyp($this->session->userdata('member_code'));
+		$data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id'));
+		$data['country'] = $this->session->userdata('current_pays');
+		$data['category'] = $this->session->userdata('category');
+
+		$this->load->view('header_sup', $data);
+		$this->load->view('historique_transactions');
+		$this->load->view('footer');
+	}
 }

application/models/User_model.php

@@ -1883,6 +1883,18 @@ class User_model extends CI_Model
         } 
     }
 
+	public function getTransactionsSup($debut ,  $fin , $codeMembre){
+		$chain = $debut ?  " AND date_created BETWEEN '".$debut."' AND '".$fin."'" : "";
+		$query = $this->db->query("SELECT *
+                                    FROM infos_transaction
+                                    WHERE `codeParrain`='".$codeMembre."'".$chain);
+		if($query->num_rows()>0){
+			return $query;
+		}else{
+			return false;
+		}
+	}
+
     public function getInfosWalletAgentForHyper($id_network){
         $query = $this->db->query("SELECT *
                                     FROM wallet_agent
@@ -2348,13 +2360,13 @@ class User_model extends CI_Model
 					$sql = "UPDATE wallets SET balance_princ = ? WHERE (`id` =  ?);";
 					$montant = $demand->montant;
 					$montantAgent = $query->first_row()->balance_princ - $montant;
-					$montantParrain = $query->first_row()->balance_princ + $montant;
+					$montantParrain = $query2->first_row()->balance_princ + $montant;
 
-					$this->db->query($sql , $montantAgent , $query->first_row()->wallet_id );
+					$this->db->query($sql , array($montantAgent , $query->first_row()->wallet_id ));
-					$this->db->query($sql , $montantParrain , $query2->first_row()->wallet_id);
+					$this->db->query($sql , array($montantParrain , $query2->first_row()->wallet_id));
 
 					$sql = "UPDATE `demandeCredits` SET `status` = '2' WHERE (`id` = ?);";
-					$this->db->query($sql , $demand->demande_id);
+					$this->db->query($sql , array($demand->demande_id));
 					return true;
 				}
 			}

application/views/calculator.php

@@ -15,6 +15,11 @@ extract($_POST);
 $showResult = false;
 $frais = 0;
 $config = $hasWallet->first_row();
+$plr_user_wallet_wallet = $plr_user_wallet_wallet ? $plr_user_wallet_wallet->result() : [];
+$plr_user_wallet_cash = $plr_user_wallet_cash ? $plr_user_wallet_cash->result() : [];
+$plr_agent_depot_wallet = $plr_agent_depot_wallet ? $plr_agent_depot_wallet->result() : [];
+$plr_agent_cash_cash = $plr_agent_cash_cash ? $plr_agent_cash_cash->result() : [];
+
 if(isset($save))
 {
 	$showResult = true;
@@ -41,7 +46,7 @@ function calculateFees1(array $paliers , $montant){
 	}
 
 	if($palier){
-		return (($palier->min * $palier->taux /100 ) + ($palier->max * $palier->taux /100 ))/2;
+		return (($palier->min + $palier->max)/2 * $palier->taux /100 );
 	}else{
 		if($montant < $min)
 			return $min* $paliers[0]->taux /100;

application/views/demande_credit.php

@@ -213,6 +213,7 @@
 									<th>" . $this->lang->line('Date de traitement') . "</th>
 									<th>" . $this->lang->line('Statut') . "</th>
 									<th>" . $this->lang->line('Délai de traitement') . "</th>
+									<th>Action</th>
 								</tr>";
 
 								?>
@@ -227,8 +228,10 @@
 								foreach ($result->result() as $row) {
 									$num++;
 										$etat = $this->lang->line("Non traitée");
+										$disabled ="disabled";
 										if ($row->statut == 1) {
 											$etat = $this->lang->line("Acceptée");
+											$disabled="";
 										} else if ($row->statut == 2) {
 											$etat = $this->lang->line("Annulée");
 										}
@@ -248,7 +251,11 @@
 										<td > ".toLocateDate($row->dateModif,$this->session->userdata('timezone'))."</td>
 										<td>$etat</td>
 										<td>" . traitementTemps($row->temps, $row->dateAjout) . "</td>
-										
+										<td>
+											<button data-id-demand=\"$row->demande_id\" class=\"btn btn-danger btn-block cancelBtn\"".$disabled ."
+												<b>".$this->lang->line('cancel')."</b>
+											</button>
+										</td>
 										 </tr>";
 
 								}
@@ -743,8 +750,10 @@
 							foreach ($result->result() as $row) {
 								$num++;
 								$etat = $this->lang->line("Non traitée");
+								$disabled="disabled";
 								if ($row->statut == 1) {
 									$etat = $this->lang->line("Acceptée");
+									$disabled = "";
 								} else if ($row->statut == 2) {
 									$etat = $this->lang->line("Annulée");
 								}
@@ -766,9 +775,9 @@
                                     <td>".toLocateDate($row->dateAjout,$this->session->userdata('timezone'))."</td>
 									<td> ".toLocateDate($row->dateModif,$this->session->userdata('timezone'))."</td>
                                     <td>$etat</td>
-                                    <td>" . traitementTemps($row->temps, $row->dateAjout) . "</td>
+                                    <td>" . traitementTemps($row->temps, $row->dateAjout) . "</td>1
                                     <td>
-											<button data-id-demand=\"$row->demande_id\" id=\"cancel\" class=\"btn btn-danger btn-block\" <?php if($row->statut == 1) echo \"disabled\"?>
+											<button data-id-demand=\"$row->demande_id\" class=\"btn btn-danger btn-block cancelBtn\"".$disabled ."
 												<b>".$this->lang->line('cancel')."</b>
 											</button>
 									</td>
@@ -1215,16 +1224,16 @@
 	});
 </script>
 <script>
-	$(document).on("click", "#cancel", function () {
+	$(document).on("click", ".cancelBtn", function () {
 		const id_demand = $(this).data('id-demand');
 		$.ajax({
 			url : '<?php echo base_url('index.php/Hyperviseur_dash/cancelCreditRequest')?>',
 			type : 'POST',
+			dataType : 'json',
 			data: {"id_demand": id_demand},
 			async:true,
 			success : function(data){
-				console.log('rep',data);
+				if(data=='200'){
-				if(data == 200){
 					Swal.fire({
 						icon: 'success',
 						title: "<?php echo $this->lang->line('canceled_credit_request')?>",

application/views/gestion_wallet_sup.php

@@ -201,6 +201,11 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
                 <div class="box box-success">
                     <div class="box-header with-border">
                         <h3 class="box-title"><?php echo $this->lang->line('Historique des 12 derniers mois'); ?></h3>
+						<div class="box-tools">
+							<a class="btn btn-primary" href="<?php echo current_url().($network_id ? '?history=transaction' : '')?>">
+								<?php echo $this->lang->line('transactions_historic'); ?>
+							</a>
+						</div>
                     </div>
                     <div class="box-body">
                         <div class="chart" id="chart">