diff --git a/Scripts/Billing/email-template-new.sh b/Scripts/Billing/email-template-new.sh index 8342280..42f17c4 100755 --- a/Scripts/Billing/email-template-new.sh +++ b/Scripts/Billing/email-template-new.sh @@ -8,13 +8,13 @@ BILLING_EMAIL="Subflexion Billing " CONTACT="support@subflexion.com" DATE=`date -R` -ORDER_ID="$6" +ORDER_ID="$7" CURRENCY="AUD" # TODO: Need to check it MAIL_PART_SEPERATOR_1="=="`date +%y%m%d%S`"===" MAIL_PART_SEPERATOR_2="==="`date +%S%d%m%y`"==" -cat - "$6" << EOF | mailx -b "jryland@xiaofrog.com" -a "From: $BILLING_EMAIL" -a "Content-Type: multipart/alternative;\n boundary=\"$MAIL_PART_SEPERATOR_1\"" -s "Order Processed" "$CUSTOMER_NAME <$CUSTOMER_EMAIL>" +cat << EOF | mailx -b "jryland@xiaofrog.com" -a "From: $BILLING_EMAIL" -a "Content-Type: multipart/alternative; boundary=\"$MAIL_PART_SEPERATOR_1\"" -s "Order Processed" "$CUSTOMER_NAME <$CUSTOMER_EMAIL>" This is a multi-part message in MIME format. --$MAIL_PART_SEPERATOR_1 @@ -23,7 +23,7 @@ [WickedDocs] $ORDER_ID -`date -R` +$DATE Order Processed Dear $CUSTOMER_NAME, @@ -37,13 +37,13 @@ *Order Details* - Product: $PRODUCT_NAME - Price: $PAYMENT $CURRENCY - $DETAILS +Product: $PRODUCT_NAME +Price: $PAYMENT $CURRENCY +$DETAILS *License* -$6 +$(cat $6) ----------------------------------------------------- @@ -82,94 +82,85 @@ - +
-
[WickedDocs] -
$ORDER_ID
- `date -R`
+ 		+ [WickedDocs] + +
$ORDER_ID
$DATE
 +
-

-
- Order Processed   -         Â
-
+
Order Processed
- 

-Dear $CUSTOMER_NAME,
+
+
 
-
+
+Dear $CUSTOMER_NAME,
+
+
 Thank you for purchasing $PRODUCT_NAME.
 We have received your payment of $PAYMENT $CURRENCY.
 
 Please take a moment to check the details of the order below:
 
-

-            

-            

+

 Order Details
-
-		Product: $PRODUCT_NAME
-		Price: $PAYMENT $CURRENCY
-		$DETAILS
-

-            License

-              

-            
-            
-              
-                
-                  
-                
-              
-            

-                    

-$6 

-                  

-            

-

-            

-            

-If any of the details are not correct, please contact us at support@subflexion.com.
+
+			Product: $PRODUCT_NAME
+			Price: $PAYMENT $CURRENCY
+			$DETAILS
+
+License
+
+	
+	
+	
+		
+	
+	
+	
$(cat $6)

+
+

 
-If you were not expecting this email, please contact us at support@subflexion.com.
+If any of the details are not correct, please contact us at support@subflexion.com.
+
+If you were not expecting this email, please contact us at support@subflexion.com.
 
 You have received this because we have received a payment from PayPal using your email address to order one of our products. 
-
-We will send you an invoice soon. If you do not receive this in the next 24 hours, please contact us at support@subflexion.com.
+
+We will send you an invoice soon. If you do not receive this in the next 24 hours, please contact us at support@subflexion.com.
 
 Please find the license key in this email and follow the instructions here to install it.
 
 
 Kind regards,
-Subflexion Team
-
+Subflexion Team
+
 

-            

-            

-              
Copyright © 2015 Subflexion, All rights reserved.
-Privacy Policy, Disclaimer, etc
-

-            

+

+

+
+
+  Copyright © 2015 Subflexion, All rights reserved.
+

+  Privacy Policy, Disclaimer, etc
+
+
+
-
--$MAIL_PART_SEPERATOR_2 Content-Type: image/jpeg Content-Transfer-Encoding: base64 -Content-ID: +Content-ID: /9j/4AAQSkZJRgABAQEAWQBZAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoM DAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsN @@ -238,3 +229,4 @@ --$MAIL_PART_SEPERATOR_1-- EOF +