Pokaz oferty - suma abo., fix bug in options array in GET

SE/VERSION

@@ -1 +1 @@
-3.9.7.8
+3.9.7.9

SE/se-lib/PokazOfertyView.php

@@ -670,7 +670,6 @@ function print_umowa(n){
 function umowaZysk_click(n) {
 	var n = $(n);
 	var visible = n.data('tip-visible');
-	console.log('visible: ', visible, ' if', (!visible));
 	if (!visible) {
 		n.data('tip-visible', true);
 	} else {
@@ -719,9 +718,17 @@ function umowaZysk_load(n) {
 
 	n.parents('table').find('input[type=\'checkbox\']:checked').each(function(ind, o){
 		if (o.value > 0) {
-			reqData[o.name] = o.value;
+			if ('[]' == o.name.substr(-2)) {
+				if (!reqData[o.name]) {
+					reqData[o.name] = [];
+				}
+				reqData[o.name].push(o.value);
+			} else {
+				reqData[o.name] = o.value;
+			}
 		}
 	});
+	//console.log('reqData', reqData);
 	reqData['id_group'] = n.data('id_group');
 
 	jQuery.ajax({

SE/superedit-POKAZ_OFERTY_AKTUALNE_FUNC.php

@@ -8899,12 +8899,19 @@ function POKAZ_OFERTY_AKTUALNE_FUNC__ajaxUmowaZysk_createJson() {
 	$procenty[]= 15;
 	$procenty[]= 30;
 
+	$suma_P_PROMO_MONTH_PRICE = $group->suma_P_PROMO_MONTH_PRICE;
+	$suma_P_CONTRACT_PRICE = $group->suma_P_CONTRACT_PRICE;
+
 	ob_start();
 	?>
-Zysk: <?php echo number_format($jsonData->zysk, 2, ',', ''); ?>
+<b>Zysk</b> <i>(netto)</i>: <?php echo number_format($jsonData->zysk, 2, ',', ''); ?>
 <?php foreach ($procenty as $procent) : ?>
-	<br><?php echo $procent; ?>%: <?php echo number_format($jsonData->zysk * $procent / 100, 2, ',', ''); ?>
+	<br>&nbsp;&nbsp;&nbsp; <?php echo $procent; ?>%: <?php echo number_format($jsonData->zysk * $procent / 100, 2, ',', ''); ?>
 <?php endforeach; ?>
+<br><b>Abonament miesięczny</b> <i>(brutto)</i>:
+<br>&nbsp;&nbsp; w promocyjnych mies.: <?php echo number_format($suma_P_PROMO_MONTH_PRICE, 2, ',', ' '); ?>
+<br>&nbsp;&nbsp; po promocji: <?php echo number_format($suma_P_CONTRACT_PRICE, 2, ',', ' '); ?>
+
 	<?php
 	$jsonData->html = ob_get_contents();
 	ob_clean();