WindykacjaPanel historia płatności fix fvat number (closes #68)

SE/superedit-USERS2_WINDYKACJA_STATUS.php

@@ -1659,15 +1659,15 @@ body{font-family:arial;}
 	}
 
 	public static function user_historia_platnosci(&$user) {
-		echo'<style type="text/css">';
-		echo"
+		?>
+		<style type="text/css">
 .hide .to-hide{display:none;}
 .may-hide .btn-hide{display:inline;padding:0 5px;border:1px solid #bbb;}
 .may-hide .btn-show{display:none;padding:0 5px;border:1px solid #bbb;}
 .hide .btn-hide{display:none;}
 .hide .btn-show{display:inline;}
-		";
-		echo'</style>';
+		</style>
+		<?php
 		Lay_Html_Toggle::show_js();
 
 		$billing_docs = WindykacjaStatsModel::get_bill_dosc_by_date($user);
@@ -1732,6 +1732,7 @@ body{font-family:arial;}
 
 		$saldo_all = 0;
 		$out_tbl = array();
+		//echo'<pre>';print_r($billing_docs_arr);echo'</pre>';
 		foreach ($billing_docs_arr as $k_data => $v_docs_arr) {
 			foreach ($v_docs_arr as $k_ind => $v_doc) {
 				$out_tr = array();
@@ -1754,10 +1755,11 @@ body{font-family:arial;}
 						//if ($h['type'] == 'FVAT') $out_tr['ID'] .= ' <a href="'."?MENU_INIT=USERS2_WINDYKACJA_STATUS&_user_id=".$user->ID."&task=view_faktura&id=".$h['ID'].'" target="_blank">'.'<img src="'."icon/search.png".'" alt="'."U".'" title="'."Podgląd faktury".'" />'.'</a>';
 					}
 					$docNr = $v_doc->get('nr');
+					$docNrLabel = $v_doc->get('NUMBER') . '/' . $v_doc->get('ID_BILLING_PREFIXES');
 					if ('FVAT' == $v_doc->get_type()) {
-						$out_tr['ID'] .= ' <a href="index.php?FUNCTION_INIT=bm_show_document&ARG1_VAL=' . $docNr . '" target="_blank">'."({$docNr})".'</a>';
+						$out_tr['ID'] .= ' <a href="index.php?FUNCTION_INIT=bm_show_document&ARG1_VAL=' . $docNr . '" target="_blank">'."({$docNrLabel})".'</a>';
 					}
-					$out_tr['nr'] = $docNr;
+					$out_tr['nr'] = $docNrLabel;
 					$out_tr['winien'] = number_format($v_doc->get('WINIEN'), 2, ',', ' ');
 					$out_tr['ma'] = number_format($v_doc->get('MA'), 2, ',', ' ');
 					$out_tr['saldo'] = number_format($v_doc->get_saldo(), 2, ',', ' ');
@@ -4634,12 +4636,16 @@ class WindykacjaStatsModel {
 				, BILLS_FVAT_POS.ID_BILLS_FVAT
 				, round(sum((BILLS_FVAT_POS.AMMOUNT * BILLS_FVAT_POS.PRICE)*(1 + BILLS_FVAT_POS.VAT/100)), 2) as WARTOSC
 				-- , count(BILLS_FVAT_POS.PRICE) as ILOSC_POZYCJI
+				, `NUMBER` as `NUMBER`
+				, `ID_BILLING_PREFIXES` as `ID_BILLING_PREFIXES`
 			from `BILLS_FVAT`
 				left join `BILLS_FVAT_POS` on BILLS_FVAT.ID=BILLS_FVAT_POS.ID_BILLS_FVAT
+				left join `BILLING_NUMBERS` on (`BILLING_NUMBERS`.`ID`=`BILLS_FVAT`.`ID_BILLING_NUMBERS`)
 			where {$sql_where}
 			group by BILLS_FVAT.ID
 			order by BILLS_FVAT.ID_BILLING_NUMBERS ASC
 		";
+		//echo'<pre>sql1:';print_r($sql);echo'</pre>';
 //echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">';print_r($sql);echo'</pre>';
 		$res = $db_webone->query($sql);
 		while ($h = $db_webone->fetch_assoc($res)) {
@@ -4683,6 +4689,7 @@ class WindykacjaStatsModel {
 
 		//$billing_types = WindykacjaStatsModel::get_billing_types(array(3, 4, 5, 7, 8));
 		$billing_types = WindykacjaStatsModel::get_billing_types();
+		//echo'<pre>$billing_types:';print_r($billing_types);echo'</pre>';
 
 		foreach ($billing_types as $bill_type) {
 			if ($bill_type['CLASS'] == 'FINANCE') {
@@ -4704,6 +4711,7 @@ class WindykacjaStatsModel {
 					where {$bill_type['TABLE']}.ID_BILLING_USERS='{$user->ID}'
 						{$sql_where}
 				";
+				//echo'<pre>sql2:';print_r($sql);echo'</pre>';
 				$res = $db_webone->query($sql);
 				while ($h = $db_webone->fetch_assoc($res)) {
 					$billing_docs->add_bill_doc($h['BILL_DATE'], $bill_type['TYPE'], $h);
@@ -4731,6 +4739,7 @@ class WindykacjaStatsModel {
 					group by {$bill_type['TABLE']}.ID
 					order by {$bill_type['TABLE']}.ID
 				";
+				//echo'<pre>sql3:';print_r($sql);echo'</pre>';
 				$res = $db_webone->query($sql);
 				while ($h = $db_webone->fetch_assoc($res)) {
 					$billing_docs->add_bill_doc($h['BILL_DATE'], $bill_type['TYPE'], $h);