diff --git a/.htaccess b/.htaccess
new file mode 100644
index 000000000000..886d649923e3
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,146 @@
+
+ RewriteEngine On
+ RewriteRule "^.env" - [F,L]
+ RewriteRule "^storage" - [F,L]
+ RewriteRule ^(.well-known)($|/) - [L]
+
+ RewriteRule ^(.*)$ public/$1 [L]
+
+
+# https://github.com/h5bp/server-configs-apache/blob/master/dist/.htaccess
+
+
+# ######################################################################
+# # INTERNET EXPLORER #
+# ######################################################################
+
+# ----------------------------------------------------------------------
+# | Iframes cookies |
+# ----------------------------------------------------------------------
+
+# Allow cookies to be set from iframes in Internet Explorer.
+#
+# https://msdn.microsoft.com/en-us/library/ms537343.aspx
+# http://www.w3.org/TR/2000/CR-P3P-20001215/
+
+
+ Header set P3P "policyref=\"/w3c/p3p.xml\", CP=\"IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT\""
+
+
+
+# ######################################################################
+# # MEDIA TYPES AND CHARACTER ENCODINGS #
+# ######################################################################
+
+# ----------------------------------------------------------------------
+# | Character encodings |
+# ----------------------------------------------------------------------
+
+# Serve all resources labeled as `text/html` or `text/plain`
+# with the media type `charset` parameter set to `UTF-8`.
+#
+# https://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset
+
+AddDefaultCharset utf-8
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+# Serve the following file types with the media type `charset`
+# parameter set to `UTF-8`.
+#
+# https://httpd.apache.org/docs/current/mod/mod_mime.html#addcharset
+
+
+ AddCharset utf-8 .atom \
+ .bbaw \
+ .css \
+ .geojson \
+ .js \
+ .json \
+ .jsonld \
+ .manifest \
+ .rdf \
+ .rss \
+ .topojson \
+ .vtt \
+ .webapp \
+ .webmanifest \
+ .xloc \
+ .xml
+
+
+
+# ######################################################################
+# # WEB PERFORMANCE #
+# ######################################################################
+
+# ----------------------------------------------------------------------
+# | Compression |
+# ----------------------------------------------------------------------
+
+
+
+ # Force compression for mangled headers.
+ # https://developer.yahoo.com/blogs/ydn/pushing-beyond-gzipping-25601.html
+
+
+
+ SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
+ RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding
+
+
+
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ # Map certain file types to the specified encoding type in order to
+ # make Apache serve them with the appropriate `Content-Encoding` HTTP
+ # response header (this will NOT make Apache compress them!).
+
+ # If the following file types wouldn't be served without the appropriate
+ # `Content-Enable` HTTP response header, client applications (e.g.:
+ # browsers) wouldn't know that they first need to uncompress the response,
+ # and thus, wouldn't be able to understand the content.
+
+ # http://httpd.apache.org/docs/current/mod/mod_mime.html#addencoding
+
+
+ AddEncoding gzip svgz
+
+
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ # Compress all output labeled with one of the following media types.
+
+ # IMPORTANT: For Apache versions below 2.3.7 you don't need to enable
+ # `mod_filter` and can remove the `` & ``
+ # lines as `AddOutputFilterByType` is still in the core directives.
+
+
+ AddOutputFilterByType DEFLATE "application/atom+xml" \
+ "application/javascript" \
+ "application/json" \
+ "application/ld+json" \
+ "application/manifest+json" \
+ "application/rdf+xml" \
+ "application/rss+xml" \
+ "application/schema+json" \
+ "application/vnd.geo+json" \
+ "application/vnd.ms-fontobject" \
+ "application/x-font-ttf" \
+ "application/x-web-app-manifest+json" \
+ "application/xhtml+xml" \
+ "application/xml" \
+ "font/opentype" \
+ "image/svg+xml" \
+ "image/x-icon" \
+ "text/cache-manifest" \
+ "text/css" \
+ "text/html" \
+ "text/javascript" \
+ "text/plain" \
+ "text/vtt" \
+ "text/x-component" \
+ "text/xml"
+
+
+
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index e0e95cbc19f2..1e4c975b0841 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -701,7 +701,7 @@ class InvoiceController extends BaseController
}
break;
case 'email':
-
+ //check query paramater for email_type and set the template else use calculateTemplate
$this->reminder_template = $invoice->calculateTemplate();
$invoice->invitations->load('contact.client.country','invoice.client.country','invoice.company')->each(function ($invitation) use ($invoice) {