|
3 | 3 | use WHMCS\Database\Capsule; |
4 | 4 |
|
5 | 5 | add_hook('EmailPreSend', 1, function($vars) { |
6 | | - if($vars['service_id']) |
| 6 | + if($vars['messageid'] == 'AMP Welcome Email' && $vars['relid']) |
7 | 7 | { |
8 | | - $service = Capsule::table('ampServices')->where('serviceId', $vars['service_id'])->first(); |
9 | | - $serverId = Capsule::table('tblhosting')->where('id', $vars['service_id'])->value('server'); |
10 | | - |
| 8 | + $relid = $vars['relid']; |
| 9 | + |
| 10 | + $service = Capsule::table('ampServices')->where('serviceId', $relid)->first(); |
| 11 | + $serverId = Capsule::table('tblhosting')->where('id', $relid)->value('server'); |
11 | 12 | $server = Capsule::table('tblservers')->where('id', $serverId)->first(); |
12 | 13 |
|
13 | | - $endpoint = (!empty( $server->hostname) ? $server->hostname: $server->ipaddress); |
| 14 | + $endpoint = (!empty($server->hostname) ? $server->hostname: $server->ipaddress); |
14 | 15 | $endpoint = (!empty($server->secure) ? 'https://' : 'http://' ). $endpoint ; |
15 | 16 |
|
16 | 17 | $endpoint = $endpoint . ((!empty($server->port) && $server->secure != true ) ? ':'.$params['serverport'] : ''); |
17 | 18 |
|
18 | 19 | $merge_fields = []; |
19 | | - $merge_fields['ampEndpoints'] = json_decode($service->endpoints, 1); |
20 | | - |
| 20 | + $merge_fields['ampEndpoints'] = json_decode($service->endpoints, 1); |
21 | 21 | $merge_fields['ampApplicationUrl'] = $endpoint . '/?instance='. $service->instanceId; |
| 22 | + $merge_fields['ampInstanceId'] = $service->instanceId; |
22 | 23 |
|
23 | 24 | return $merge_fields; |
24 | 25 | } |
@@ -149,7 +150,7 @@ function tableToJson(table) { |
149 | 150 | var tableRow = table.rows[i]; |
150 | 151 | var rowData = []; |
151 | 152 | for (var j=0; j<tableRow.cells.length - 1; j++) { |
152 | | - rowData.push(tableRow.cells[j].innerHTML);; |
| 153 | + rowData.push(tableRow.cells[j].innerHTML); |
153 | 154 | } |
154 | 155 | data.push(rowData); |
155 | 156 | } |
|
0 commit comments