Browse Source

added filtr isMovedToVectra in WindykacjaPanel

Piotr Labudda 10 năm trước cách đây
mục cha
commit
0af01f2d41
1 tập tin đã thay đổi với 29 bổ sung10 xóa
  1. 29 10
      SE/superedit-USERS2_WINDYKACJA_STATUS.php

+ 29 - 10
SE/superedit-USERS2_WINDYKACJA_STATUS.php

@@ -849,7 +849,7 @@ if (V::get('DBG', '', $_GET, 'int') > 0) {// TODO: TEST
 		echo '<tr>';
 			echo '<th>' . "Przeniesienie do Vectra?:" . '</th>';
 			echo '<td>';
-				if ($user->isMovedToVectra) {
+				if ($user->IS_MOVED_TO_VECTRA) {
 					echo 'TAK';
 				} else {
 					echo '<span class="text-muted">NIE</span>';
@@ -1270,7 +1270,7 @@ function frm_kontakt_add_id_koresp(frm){
 		unset($filter_arr['15']);
 		unset($filter_arr['blokada']);
 		unset($filter_arr['WAITING']);
-		$sub_filters = array('tel1', 'bad_address', '3 m-ce przed', 'po-terminie', 'has_nr_sad', 'has_nr_komornik', 'has_ustalenia', 'sad_and_komornik', 'sad_bez_komornik');
+		$sub_filters = array('tel1', 'bad_address', '3 m-ce przed', 'po-terminie', 'has_nr_sad', 'has_nr_komornik', 'has_ustalenia', 'sad_and_komornik', 'sad_bez_komornik', 'isMovedToVectra');
 		$sub_filters_arr = array();
 		foreach ($sub_filters as $v_filter_name) {
 			if (array_key_exists($v_filter_name, $filter_arr)) {
@@ -1455,7 +1455,7 @@ function frm_kontakt_add_id_koresp(frm){
 		$cols['LAST_PAY_DATE'] = array('label'=>'data ostatniej wpłaty', 'title'=>'LAST_PAY_DATE');
 		$cols['LAST_PAY_VALUE'] = array('label'=>'kwota ostatniej wpłaty', 'title'=>'LAST_PAY_VALUE');
 		$cols['PAY_TERM'] = array('label'=>'termin płatności', 'title'=>'PAY_TERM');
-		$cols['isMovedToVectra'] = array('label'=>'Przeniesienie do Vectra?', 'title'=>'isMovedToVectra');
+		$cols['IS_MOVED_TO_VECTRA'] = array('label'=>'Przeniesienie do Vectra?', 'title'=>'IS_MOVED_TO_VECTRA');
 		$cols['HAS_ACTIVE_NET'] = array('label'=>'NET', 'title'=>'Aktywne usługi NET');
 		$cols['HAS_ACTIVE_TV']  = array('label'=>'TV',  'title'=>'Aktywne uslugi TV');
 
@@ -1622,7 +1622,7 @@ function frm_kontakt_add_id_koresp(frm){
 					}
 				echo'</td>';
 				echo'<td>';
-					if ($user->isMovedToVectra) {
+					if ($user->IS_MOVED_TO_VECTRA) {
 						echo 'TAK';
 					} else {
 						echo '<span class="text-muted">NIE</span>';
@@ -1677,7 +1677,7 @@ function frm_kontakt_add_id_koresp(frm){
 		$cols['PAY_TERM'] = array('label'=>'termin płatności', 'title'=>'PAY_TERM');
 		$cols['ACCOUNT_NUMBER'] = array('label'=>'nr konta', 'title'=>'ACCOUNT_NUMBER');
 		$cols['SERVICES_STREETS'] = array('label'=>'adresy usług', 'title'=>'SERVICES_STREETS');
-		$cols['isMovedToVectra'] = array('label'=>'Przeniesienie do Vectra', 'title'=>'isMovedToVectra');
+		$cols['IS_MOVED_TO_VECTRA'] = array('label'=>'Przeniesienie do Vectra', 'title'=>'IS_MOVED_TO_VECTRA');
 		$cols['HAS_ACTIVE_NET'] = array('label'=>'NET', 'title'=>'Aktywne usługi NET');
 		$cols['HAS_ACTIVE_TV']  = array('label'=>'TV',  'title'=>'Aktywne uslugi TV');
 
@@ -1722,7 +1722,7 @@ function frm_kontakt_add_id_koresp(frm){
 			$out_cols[] = '"' . (($user->PAY_TERM != '0000-00-00')? $user->PAY_TERM : '') . '"';
 			$out_cols[] = '"' . $user->ACCOUNT_NUMBER . '"';
 			$out_cols[] = '"' . $user->SERVICES_STREETS . '"';
-			$out_cols[] = '"' . (($user->isMovedToVectra)? 'TAK' : 'NIE') . '"';
+			$out_cols[] = '"' . (($user->IS_MOVED_TO_VECTRA)? 'TAK' : 'NIE') . '"';
 			$out_cols[] = '"' . $user->HAS_ACTIVE_NET . '"';
 			$out_cols[] = '"' . $user->HAS_ACTIVE_TV . '"';
 			echo implode(";", $out_cols) . "\n";
@@ -3790,6 +3790,7 @@ class WindykacjaStatsHelper {
 		$filter_arr['has_ustalenia'] = array("ustalenia z klientem");
 		$filter_arr['sad_and_komornik'] = array("sąd z komornik");
 		$filter_arr['sad_bez_komornik'] = array("sąd bez komornik");
+		$filter_arr['isMovedToVectra'] = array("przeniesieni do Vectra");
 		return $filter_arr;
 	}
 
@@ -3979,7 +3980,7 @@ class WindykacjaStatsHelper {
 							and `ID_BILLING_USERS`='{$user->ID}'
 						order by `ID` DESC
 						limit 1)
-						), 1, 0) as isMovedToVectra
+						), 1, 0) as IS_MOVED_TO_VECTRA
 			";
 			DBG::_('DBG_ACTIVE_SRV', '>2', "DBG_ACTIVE_SRV sql", $sql, __CLASS__, __FUNCTION__, __LINE__);
 			$res = $db->query($sql);
@@ -3987,7 +3988,7 @@ class WindykacjaStatsHelper {
 				DBG::_('DBG_ACTIVE_SRV', '>2', "r", $r, __CLASS__, __FUNCTION__, __LINE__);
 				$hasActiveNET = V::get('hasActiveNET', '', $r);
 				$hasActiveTV  = V::get('hasActiveTV', '', $r);
-				$isMovedToVectra = V::get('isMovedToVectra', '', $r);
+				$isMovedToVectra = V::get('IS_MOVED_TO_VECTRA', '', $r);
 			}
 			$data_arr['HAS_ACTIVE_NET'] = $hasActiveNET;
 			$data_arr['HAS_ACTIVE_TV']  = $hasActiveTV;
@@ -4846,6 +4847,20 @@ SQL;
 			$ret['sad_and_komornik'] = (object)array('A_STATUS'=>'sad_and_komornik', 'cnt'=>$r->cnt_komornik, 'suma_zaleglosci'=>null);
 			$ret['sad_bez_komornik'] = (object)array('A_STATUS'=>'sad_bez_komornik', 'cnt'=>($r->cnt - $r->cnt_komornik), 'suma_zaleglosci'=>null);
 		}
+		// filter: 'isMovedToVectra'
+		$sql = "select w.`A_STATUS`
+				, count(1) as cnt
+				, sum(IF(w.`PAY_SALDO`<={$stanZeroLimit}, w.`PAY_SALDO`, 0)) as suma_zaleglosci
+			from  `USERS2_WINDYKACJA_STATUS` as w
+				left join `BILLING_USERS_ADD` as a on(a.`id_users`=w.`ID_BILLING_USERS`)
+			where
+				w.`IS_MOVED_TO_VECTRA`=1
+				{$sqlWhereAdd}
+		";
+		$res = $db->query($sql);
+		if ($r = $db->fetch($res)) {
+			$ret['isMovedToVectra'] = (object)array('cnt'=>$r->cnt, 'suma_zaleglosci'=>$r->suma_zaleglosci);
+		}
 		return $ret;
 	}
 
@@ -4910,6 +4925,9 @@ class WindykacjaStatsModel {
 			else if ($filter_selected == 'sad_bez_komornik') {
 				$sql_where_and_arr[] = "w.`A_STATUS`='sad' and w.`NR_SPRAWY_KOMORNIK`=''";
 			}
+			else if ($filter_selected == 'isMovedToVectra') {
+				$sql_where_and_arr[] = "w.`IS_MOVED_TO_VECTRA`=1";
+			}
 			else {
 				$sql_where_and_arr[] = "w.`A_STATUS`='{$filter_selected}'";
 			}
@@ -5008,6 +5026,7 @@ class WindykacjaStatsModel {
 		$order_by_fields[] = 'PAY_TERM';
 		$order_by_fields[] = 'HAS_ACTIVE_NET';
 		$order_by_fields[] = 'HAS_ACTIVE_TV';
+		$order_by_fields[] = 'IS_MOVED_TO_VECTRA';
 		return $order_by_fields;
 	}
 
@@ -5079,14 +5098,14 @@ class WindykacjaStatsModel {
 				, w.`NR_SPRAWY_KOMORNIK`
 				, w.`ACCOUNT_NUMBER`
 				, w.`SERVICES_STREETS`
-				, w.`IS_MOVED_TO_VECTRA` as isMovedToVectra
+				, w.`IS_MOVED_TO_VECTRA` as IS_MOVED_TO_VECTRA
 --				, ('REZYGNACJA_Z_PRZEJSCIEM_DO_VECTRA'=(select `RODZAJ_DZIALANIA_HANDLOWEGO`
 --						from `DEALS_TABLE`
 --						where `A_STATUS`='NORMAL'
 --							and `ID_BILLING_USERS`=w.`ID_BILLING_USERS`
 --						order by `ID` DESC
 --						limit 1)
---					) as isMovedToVectra
+--					) as IS_MOVED_TO_VECTRA
 				, w.`HAS_ACTIVE_NET`
 				, w.`HAS_ACTIVE_TV`
 		";