Преглед изворни кода

Fix sql in Atkualizacja tabel statystycznych sprzedaży (see #71)

Piotr Labudda пре 11 година
родитељ
комит
749965a43c
1 измењених фајлова са 3 додато и 3 уклоњено
  1. 3 3
      SE/superedit-RECOUNT_STATS_BILLS_FVAT_POS.php

+ 3 - 3
SE/superedit-RECOUNT_STATS_BILLS_FVAT_POS.php

@@ -146,7 +146,7 @@ jQuery(document).ready(function () {
 
 
 		$sqlList[] = "update `stats_BILLS_FVAT_POS` f
 		$sqlList[] = "update `stats_BILLS_FVAT_POS` f
 				join `USERS2_OFFERS` o on(o.`ID`=f.`ID_OFFERS`)
 				join `USERS2_OFFERS` o on(o.`ID`=f.`ID_OFFERS`)
-				join `USERS2_OFFERS_COSTS_GROUPS` c on(c.`ID`=o.`ID_COSTS_GROUPS`)
+				left join `USERS2_OFFERS_COSTS_GROUPS` c on(c.`ID`=o.`ID_COSTS_GROUPS`)
 			set
 			set
 				f.`P_SERVICE`=IF(o.`P_SERVICE`='OPCJE'
 				f.`P_SERVICE`=IF(o.`P_SERVICE`='OPCJE'
 					, concat(o.`P_SERVICE`, '_', o.`P_SERVICE_PARENT`)
 					, concat(o.`P_SERVICE`, '_', o.`P_SERVICE_PARENT`)
@@ -155,10 +155,10 @@ jQuery(document).ready(function () {
 				, f.`P_NET_SPEED`=IF(o.`P_SERVICE` in('NET')
 				, f.`P_NET_SPEED`=IF(o.`P_SERVICE` in('NET')
 					, o.`P_S_PARAM1`
 					, o.`P_S_PARAM1`
 					, '')
 					, '')
-				, f.`P_TV_NAME`=IF(o.`P_SERVICE` in('TV','TVC','TVCP','OPCJA_TVC')
+				, f.`P_TV_NAME`=IF(o.`P_SERVICE` in('TV','TVC','TVCP','OPCJE_TVC') or (o.`P_SERVICE`='OPCJE' and o.`P_SERVICE_PARENT` in('TVC','TVCP'))
 					, o.`P_SERVICE_NAME`
 					, o.`P_SERVICE_NAME`
 					, '')
 					, '')
-				, f.`P_TEL_NAME`=IF(o.`P_SERVICE` in('TEL','OPCJA_TEL')
+				, f.`P_TEL_NAME`=IF(o.`P_SERVICE` in('TEL','OPCJE_TEL')
 					, o.`P_SERVICE_NAME`
 					, o.`P_SERVICE_NAME`
 					, '')
 					, '')
 				, f.`P_OFFER_COSTS`=c.`P_OFFER_COSTS`
 				, f.`P_OFFER_COSTS`=c.`P_OFFER_COSTS`