diff --git a/Scripts/Billing/email-template.sh b/Scripts/Billing/email-template.sh index 6aefd8b..fca45e4 100755 --- a/Scripts/Billing/email-template.sh +++ b/Scripts/Billing/email-template.sh @@ -1,28 +1,14 @@ #!/bin/bash CUSTOMER_NAME='John Ryland' -CUSTOMER_EMAIL='John Ryland ' +CUSTOMER_EMAIL='John Ryland ' PRODUCT_NAME='WickedDocs v1.0' PAYMENT='$0.99' -DETAILS='order details ...' CONTACT='support@subflexion.com' +DATE=`date -R` +DETAILS='order details ...' - -# These get added -# From jryland@johns-linux Sun Jul 12 21:40:33 2015 -# Return-Path: -# X-Original-To: jryland@localhost -# Delivered-To: jryland@localhost -# XX -# Status: R - - -cat << EOF -Date: `date -R` -To: $CUSTOMER_EMAIL -From: Billing -Reply-To: billing@subflexion.com -Subject: Order Processed +cat << EOF | mailx -a "From: Subflexion Billing " -s "Order Processed" "$CUSTOMER_EMAIL" Dear $CUSTOMER_NAME, @@ -31,17 +17,33 @@ Thank you for purchasing $PRODUCT_NAME. We have received your payment of $PAYMENT. -If you were not expecting this email, please contact us at $CONTACT. You have received this because we have received a payment from PayPal using your email address to order one of our products. +If you were not expecting this email, please contact us at $CONTACT. + +You have received this because we have received a payment from PayPal using your email address to order one of our products. Please take a moment to check the details of the order below: -$DETAILS +Order Details: + + Date: $DATE + Product: $PRODUCT_NAME + Price: $PAYMENT + $DETAILS + +Your Details: + + Name: $CUSTOMER_NAME + Email: $CUSTOMER_EMAIL + If any of the details are not correct, please contact us at $CONTACT. +We will send you an invoice and your license key soon. If you do not recieve these in the next 12 hours, please contact us as $CONTACT. -Regards + +Kind regards, Subflexion Team + EOF diff --git a/Scripts/Billing/email-template.sh b/Scripts/Billing/email-template.sh index 6aefd8b..fca45e4 100755 --- a/Scripts/Billing/email-template.sh +++ b/Scripts/Billing/email-template.sh @@ -1,28 +1,14 @@ #!/bin/bash CUSTOMER_NAME='John Ryland' -CUSTOMER_EMAIL='John Ryland ' +CUSTOMER_EMAIL='John Ryland ' PRODUCT_NAME='WickedDocs v1.0' PAYMENT='$0.99' -DETAILS='order details ...' CONTACT='support@subflexion.com' +DATE=`date -R` +DETAILS='order details ...' - -# These get added -# From jryland@johns-linux Sun Jul 12 21:40:33 2015 -# Return-Path: -# X-Original-To: jryland@localhost -# Delivered-To: jryland@localhost -# XX -# Status: R - - -cat << EOF -Date: `date -R` -To: $CUSTOMER_EMAIL -From: Billing -Reply-To: billing@subflexion.com -Subject: Order Processed +cat << EOF | mailx -a "From: Subflexion Billing " -s "Order Processed" "$CUSTOMER_EMAIL" Dear $CUSTOMER_NAME, @@ -31,17 +17,33 @@ Thank you for purchasing $PRODUCT_NAME. We have received your payment of $PAYMENT. -If you were not expecting this email, please contact us at $CONTACT. You have received this because we have received a payment from PayPal using your email address to order one of our products. +If you were not expecting this email, please contact us at $CONTACT. + +You have received this because we have received a payment from PayPal using your email address to order one of our products. Please take a moment to check the details of the order below: -$DETAILS +Order Details: + + Date: $DATE + Product: $PRODUCT_NAME + Price: $PAYMENT + $DETAILS + +Your Details: + + Name: $CUSTOMER_NAME + Email: $CUSTOMER_EMAIL + If any of the details are not correct, please contact us at $CONTACT. +We will send you an invoice and your license key soon. If you do not recieve these in the next 12 hours, please contact us as $CONTACT. -Regards + +Kind regards, Subflexion Team + EOF diff --git a/Scripts/Billing/process-order.sh b/Scripts/Billing/process-order.sh index a461c2d..59a92c0 100755 --- a/Scripts/Billing/process-order.sh +++ b/Scripts/Billing/process-order.sh @@ -1,7 +1,7 @@ #!/bin/bash -BILLING_PATH="$HOME/Code/code/Scripts/Billing" -OUTPUT=`$BILLING_PATH/dkim-verify.sh test.txt` +BILLING_PATH="$HOME/Scripts/Billing" +OUTPUT=`$BILLING_PATH/dkim-verify.sh $1` RESULT=$? if [ "$RESULT" != "0" ] then