Couple of fixes ... calc JS (if observed element is in repeat group), paypal (extra logging), map viz (API key on static map usage)

Author: cheesegrits

plugins/fabrik_element/calc/calc-min.js

@@ -67,7 +67,7 @@ define(['jquery', 'fab/element'], function (jQuery, FbElement) {
                     this.form.repeatGroupMarkers.each(function (v, k) {
                         o2 = '';
                         for (v2 = 0; v2 < v; v2++) {
-                            o2 = 'join___' + this.form.options.group_join_ids[k] + '___' + o + '_' + v2;
+                            o2 = o + '_' + v2;
                             if (this.form.formElements[o2]) {
                                 // $$$ hugh - think we can add this one as sticky ...
                                 this.form.formElements[o2].addNewEvent(this.form.formElements[o2].getChangeEvent(),
@@ -86,7 +86,7 @@ define(['jquery', 'fab/element'], function (jQuery, FbElement) {
             var testData = $H(this.form.getFormData(false));
 
             testData.each(function (v, k) {
-                if (k.test(/^join\[\d+\]/) || k.test(/^fabrik_vars/)) {
+                if (k.test(/\[\d+\]$/) || k.test(/^fabrik_vars/)) {
                     formData[k] = v;
                 }
             }.bind(this));

plugins/fabrik_element/calc/calc.js

@@ -189,6 +189,10 @@ public function onAfterProcess()
 			$subDb->setQuery($query);
 			$sub = $subDb->loadObject();
 
+			// Log the query
+			$this->doLog('fabrik.paypal.onAfterProcess.debug', "Subscription query: " . (string)$query);
+
+
 			if (is_object($sub))
 			{
 				$opts['p3'] = $sub->p3;

plugins/fabrik_form/paypal/paypal.php

@@ -711,6 +711,27 @@ public function getStaticMap()
 
 		$uri = JURI::getInstance();
 		$src = $uri->getScheme() . "://maps.google.com/staticmap?center=$lat,$lon&zoom={$z}&size={$w}x{$h}&maptype=mobile$iconStr";
+
+		$config = JComponentHelper::getParams('com_fabrik');
+		$apiKey = $config->get('google_api_key', '');
+		$client = $config->get('google_buisness_client_id', '');
+		$signature = $config->get('google_buisness_signature', '');
+
+		if ($client !== '')
+		{
+			if ($signature === '')
+			{
+				throw new Exception('You have entered a Google Maps Business Client id, but have not supplied a signature value');
+			}
+
+			$src .= '&client=' . $client;
+			$src .= '&signature=' . $signature;
+		}
+		elseif ($apiKey !== '')
+		{
+			$src .= '&key=' . $apiKey;
+		}
+
 		$str = '<img src="' . $src . '" alt="static map" />';
 
 		return $str;