|
@@ -54,7 +54,7 @@ class EmailService
|
|
->post($url, $data)
|
|
->post($url, $data)
|
|
->body();
|
|
->body();
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
|
|
|
|
return json_decode($response, true);
|
|
return json_decode($response, true);
|
|
}
|
|
}
|
|
@@ -242,7 +242,7 @@ class EmailService
|
|
$html = (string) view('emails.templates.attachment', compact('params', 'appUrl', 'emailFromName', 'appInternalName', 'stringMappingConfig'));
|
|
$html = (string) view('emails.templates.attachment', compact('params', 'appUrl', 'emailFromName', 'appInternalName', 'stringMappingConfig'));
|
|
$plainText = (string) '';
|
|
$plainText = (string) '';
|
|
|
|
|
|
- $attachment = $this->getAttachmentFromStoragePath($params['attachmentPath'], 'attachment1');
|
|
|
|
|
|
+ // $attachment = $this->getAttachmentFromStoragePath($params['attachmentPath'], 'attachment1');
|
|
|
|
|
|
|
|
|
|
$emailParams = [
|
|
$emailParams = [
|
|
@@ -253,11 +253,11 @@ class EmailService
|
|
'contentHtml' => $html,
|
|
'contentHtml' => $html,
|
|
'contentText' => $plainText,
|
|
'contentText' => $plainText,
|
|
'entityType' => null,
|
|
'entityType' => null,
|
|
- 'entityUid' => null,
|
|
|
|
- 'attachment1' => $attachment
|
|
|
|
|
|
+ 'entityUid' => null
|
|
|
|
+ // 'attachment1' => $attachment
|
|
];
|
|
];
|
|
|
|
|
|
- $response = $this->callJava('/api/email/send', $emailParams, null, $attachment);
|
|
|
|
|
|
+ $response = $this->callJava('/api/email/send', $emailParams, null);
|
|
}
|
|
}
|
|
|
|
|
|
protected function getAttachmentFromStoragePath($path, $fileName){
|
|
protected function getAttachmentFromStoragePath($path, $fileName){
|
|
@@ -269,7 +269,7 @@ class EmailService
|
|
'mime' => Storage::disk('custom')->mimeType($path),
|
|
'mime' => Storage::disk('custom')->mimeType($path),
|
|
];
|
|
];
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
}
|
|
}
|