Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Robert Spencer
wiaflos
Commits
21276f9d
Commit
21276f9d
authored
Dec 02, 2016
by
Nigel Kukard
Browse files
Merge branch 'nkupdates' into 'master'
Pulled in latest development changes See merge request !23
parents
d98f0e6e
733c171f
Changes
5
Hide whitespace changes
Inline
Side-by-side
wiaflos/server/core/Invoicing.pm
View file @
21276f9d
...
@@ -1230,13 +1230,6 @@ sub sendInvoice
...
@@ -1230,13 +1230,6 @@ sub sendInvoice
my
$emailAddy
=
$
1
;
my
$emailAddy
=
$
1
;
$emailAddy
=
$billEmailAddr
if
(
!
defined
(
$emailAddy
));
$emailAddy
=
$billEmailAddr
if
(
!
defined
(
$emailAddy
));
# Verify SMTP server is set
my
$server
=
$config
->
{'
mail
'}{'
server
'};
if
(
!
defined
(
$server
)
||
$server
eq
"")
{
setError
("
Cannot use invoice emailing if we do not have an SMTP server defined
");
return
ERR_SRVPARAM
;
}
# Check if we have a email addy
# Check if we have a email addy
if
(
$emailAddy
eq
"")
{
if
(
$emailAddy
eq
"")
{
setError
("
No email address defined to send client invoice '
"
.
$invoice
->
{'
Number
'}
.
"
' to
");
setError
("
No email address defined to send client invoice '
"
.
$invoice
->
{'
Number
'}
.
"
' to
");
...
@@ -1298,6 +1291,7 @@ sub sendInvoice
...
@@ -1298,6 +1291,7 @@ sub sendInvoice
From
=>
$config
->
{'
invoicing
'}{'
email_from
'},
From
=>
$config
->
{'
invoicing
'}{'
email_from
'},
To
=>
$emailAddy
,
To
=>
$emailAddy
,
Bcc
=>
$config
->
{'
invoicing
'}{'
email_bcc
'},
Bcc
=>
$config
->
{'
invoicing
'}{'
email_bcc
'},
'
Reply-To
'
=>
$config
->
{'
invoicing
'}{'
email_reply_to
'},
Subject
=>
"
Invoice:
"
.
$invoice
->
{'
Number
'},
Subject
=>
"
Invoice:
"
.
$invoice
->
{'
Number
'},
Type
=>
'
multipart/mixed
'
Type
=>
'
multipart/mixed
'
);
);
...
@@ -1331,10 +1325,19 @@ sub sendInvoice
...
@@ -1331,10 +1325,19 @@ sub sendInvoice
}
}
# Send email
# Send email
my
@SMTPParams
;
my
$server
=
$config
->
{'
mail
'}{'
server
'};
if
(
!
(
my
$res
=
$msg
->
send
("
smtp
",
$server
)))
{
if
(
defined
(
$server
)
&&
$server
ne
"")
{
setError
("
Failed to send invoice via email server '
$server
'
");
# Send email via SMTP
return
ERR_SRVEXEC
;
if
(
!
(
my
$res
=
$msg
->
send
("
smtp
",
$server
)))
{
setError
("
Failed to send invoice via email server '
$server
'
");
return
ERR_SRVEXEC
;
}
}
else
{
# Send email via Sendmail
if
(
!
(
my
$res
=
$msg
->
send
("
sendmail
")))
{
setError
("
Failed to send invoice via sendmail
");
return
ERR_SRVEXEC
;
}
}
}
}
else
{
}
else
{
...
...
wiaflos/server/core/Receipting.pm
View file @
21276f9d
...
@@ -1251,13 +1251,6 @@ sub sendReceipt
...
@@ -1251,13 +1251,6 @@ sub sendReceipt
# Pull email addr
# Pull email addr
my
$emailAddy
=
$
1
ne
""
?
$
1
:
$billEmailAddr
;
my
$emailAddy
=
$
1
ne
""
?
$
1
:
$billEmailAddr
;
# Verify SMTP server is set
my
$server
=
$config
->
{'
mail
'}{'
server
'};
if
(
!
defined
(
$server
)
||
$server
eq
"")
{
setError
("
Cannot use receipt emailing if we do not have an SMTP server defined
");
return
ERR_SRVPARAM
;
}
# Check if we have a email addy
# Check if we have a email addy
if
(
$emailAddy
eq
"")
{
if
(
$emailAddy
eq
"")
{
setError
("
No email address defined to send receipt '
"
.
$receipt
->
{'
Number
'}
.
"
' to
");
setError
("
No email address defined to send receipt '
"
.
$receipt
->
{'
Number
'}
.
"
' to
");
...
@@ -1319,6 +1312,7 @@ sub sendReceipt
...
@@ -1319,6 +1312,7 @@ sub sendReceipt
From
=>
$config
->
{'
receipting
'}{'
email_from
'},
From
=>
$config
->
{'
receipting
'}{'
email_from
'},
To
=>
$emailAddy
,
To
=>
$emailAddy
,
Bcc
=>
$config
->
{'
receipting
'}{'
email_bcc
'},
Bcc
=>
$config
->
{'
receipting
'}{'
email_bcc
'},
'
Reply-To
'
=>
$config
->
{'
receipting
'}{'
email_reply_to
'},
Subject
=>
"
Receipt:
"
.
$receipt
->
{'
Number
'},
Subject
=>
"
Receipt:
"
.
$receipt
->
{'
Number
'},
Type
=>
'
multipart/mixed
'
Type
=>
'
multipart/mixed
'
);
);
...
@@ -1352,11 +1346,19 @@ sub sendReceipt
...
@@ -1352,11 +1346,19 @@ sub sendReceipt
}
}
# Send email
# Send email
my
@SMTPParams
;
my
$server
=
$config
->
{'
mail
'}{'
server
'};
$res
=
$msg
->
send
("
smtp
",
$server
);
if
(
defined
(
$server
)
&&
$server
ne
"")
{
if
(
!
$res
)
{
# Send email via SMTP
setError
("
Failed to send receipt via email server '
$server
'
");
if
(
!
(
my
$res
=
$msg
->
send
("
smtp
",
$server
)))
{
return
ERR_SRVEXEC
;
setError
("
Failed to send receipt via email server '
$server
'
");
return
ERR_SRVEXEC
;
}
}
else
{
# Send email via Sendmail
if
(
!
(
my
$res
=
$msg
->
send
("
sendmail
")))
{
setError
("
Failed to send receipt via sendmail
");
return
ERR_SRVEXEC
;
}
}
}
}
else
{
}
else
{
...
...
wiaflos/server/core/Reporting.pm
View file @
21276f9d
...
@@ -891,18 +891,6 @@ sub sendReport
...
@@ -891,18 +891,6 @@ sub sendReport
# Pull in email address user specified
# Pull in email address user specified
my
$emailAddy
=
$
1
;
my
$emailAddy
=
$
1
;
# Verify SMTP server is set
my
$server
=
$config
->
{'
mail
'}{'
server
'};
if
(
!
defined
(
$server
)
||
$server
eq
"")
{
if
(
!
$background
)
{
setError
("
Cannot use report emailing if we do not have an SMTP server defined
");
return
ERR_SRVPARAM
;
}
else
{
wiaflos::server::core::jobs::
setStatus
("
Cannot use report emailing if we do not have an SMTP server defined
");
exit
0
;
}
}
# Check if we have a email addy
# Check if we have a email addy
if
(
!
defined
(
$emailAddy
)
||
$emailAddy
eq
"")
{
if
(
!
defined
(
$emailAddy
)
||
$emailAddy
eq
"")
{
if
(
!
$background
)
{
if
(
!
$background
)
{
...
@@ -1024,14 +1012,28 @@ sub sendReport
...
@@ -1024,14 +1012,28 @@ sub sendReport
wiaflos::server::core::jobs::
setStatus
("
Sending mail...
");
wiaflos::server::core::jobs::
setStatus
("
Sending mail...
");
# Send email
# Send email
my
@SMTPParams
;
my
$server
=
$config
->
{'
mail
'}{'
server
'};
if
(
!
(
my
$res
=
$msg
->
send
("
smtp
",
$server
)))
{
if
(
defined
(
$server
)
&&
$server
ne
"")
{
if
(
!
$background
)
{
# Send email via SMTP
setError
("
Failed to send report via email server '
$server
'
");
if
(
!
(
my
$res
=
$msg
->
send
("
smtp
",
$server
)))
{
return
ERR_SRVEXEC
;
if
(
!
$background
)
{
}
else
{
setError
("
Failed to send report via email server '
$server
'
");
wiaflos::server::core::jobs::
setStatus
("
Failed to send report via email server '
$server
'
");
return
ERR_SRVEXEC
;
exit
0
;
}
else
{
wiaflos::server::core::jobs::
setStatus
("
Failed to send report via email server '
$server
'
");
exit
0
;
}
}
}
else
{
# Send email via Sendmail
if
(
!
(
my
$res
=
$msg
->
send
("
sendmail
")))
{
if
(
!
$background
)
{
setError
("
Failed to send report via sendmail
");
return
ERR_SRVEXEC
;
}
else
{
wiaflos::server::core::jobs::
setStatus
("
Failed to send report via email server sendmail
");
exit
0
;
}
}
}
}
}
...
...
wiaflos/server/core/Statements.pm
View file @
21276f9d
...
@@ -290,13 +290,6 @@ sub sendStatement
...
@@ -290,13 +290,6 @@ sub sendStatement
# Pull email address user specified if its defined and not blank, or use billing email address
# Pull email address user specified if its defined and not blank, or use billing email address
my
$emailAddy
=
(
defined
(
$
1
)
&&
$
1
ne
"")
?
$
1
:
$billEmailAddr
;
my
$emailAddy
=
(
defined
(
$
1
)
&&
$
1
ne
"")
?
$
1
:
$billEmailAddr
;
# Verify SMTP server is set
my
$server
=
$config
->
{'
mail
'}{'
server
'};
if
(
!
defined
(
$server
)
||
$server
eq
"")
{
setError
("
Cannot use statement emailing if we do not have an SMTP server defined
");
return
ERR_SRVPARAM
;
}
# Check if we have a email addy
# Check if we have a email addy
if
(
$emailAddy
eq
"")
{
if
(
$emailAddy
eq
"")
{
setError
("
No email address defined to send statement to
");
setError
("
No email address defined to send statement to
");
...
@@ -359,6 +352,7 @@ sub sendStatement
...
@@ -359,6 +352,7 @@ sub sendStatement
From
=>
$config
->
{'
statements
'}{'
email_from
'},
From
=>
$config
->
{'
statements
'}{'
email_from
'},
To
=>
$emailAddy
,
To
=>
$emailAddy
,
Bcc
=>
$config
->
{'
statements
'}{'
email_bcc
'},
Bcc
=>
$config
->
{'
statements
'}{'
email_bcc
'},
'
Reply-To
'
=>
$config
->
{'
statements
'}{'
email_reply_to
'},
Subject
=>
$subject
,
Subject
=>
$subject
,
Type
=>
'
multipart/mixed
'
Type
=>
'
multipart/mixed
'
);
);
...
@@ -392,10 +386,19 @@ sub sendStatement
...
@@ -392,10 +386,19 @@ sub sendStatement
}
}
# Send email
# Send email
my
@SMTPParams
;
my
$server
=
$config
->
{'
mail
'}{'
server
'};
if
(
!
(
my
$res
=
$msg
->
send
("
smtp
",
$server
)))
{
if
(
defined
(
$server
)
&&
$server
ne
"")
{
setError
("
Failed to send statement via email server '
$server
'
");
# Send email via SMTP
return
ERR_SRVEXEC
;
if
(
!
(
my
$res
=
$msg
->
send
("
smtp
",
$server
)))
{
setError
("
Failed to send statement via email server '
$server
'
");
return
ERR_SRVEXEC
;
}
}
else
{
# Send email via Sendmail
if
(
!
(
my
$res
=
$msg
->
send
("
sendmail
")))
{
setError
("
Failed to send statement via sendmail
");
return
ERR_SRVEXEC
;
}
}
}
}
else
{
}
else
{
...
...
wiaflos/server/core/SupplierReceipting.pm
View file @
21276f9d
...
@@ -1075,13 +1075,6 @@ sub sendSupplierReceipt
...
@@ -1075,13 +1075,6 @@ sub sendSupplierReceipt
# Pull email addr
# Pull email addr
my
$emailAddy
=
$
1
ne
""
?
$
1
:
$billEmailAddr
;
my
$emailAddy
=
$
1
ne
""
?
$
1
:
$billEmailAddr
;
# Verify SMTP server is set
my
$server
=
$config
->
{'
mail
'}{'
server
'};
if
(
!
defined
(
$server
)
||
$server
eq
"")
{
setError
("
Cannot use supplier receipt emailing if we do not have an SMTP server defined
");
return
ERR_SRVPARAM
;
}
# Check if we have a email addy
# Check if we have a email addy
if
(
$emailAddy
eq
"")
{
if
(
$emailAddy
eq
"")
{
setError
("
No email address defined to send supplier receipt '
"
.
$receipt
->
{'
Number
'}
.
"
' to
");
setError
("
No email address defined to send supplier receipt '
"
.
$receipt
->
{'
Number
'}
.
"
' to
");
...
@@ -1144,6 +1137,7 @@ sub sendSupplierReceipt
...
@@ -1144,6 +1137,7 @@ sub sendSupplierReceipt
From
=>
$config
->
{'
supplierreceipting
'}{'
email_from
'},
From
=>
$config
->
{'
supplierreceipting
'}{'
email_from
'},
To
=>
$emailAddy
,
To
=>
$emailAddy
,
Bcc
=>
$config
->
{'
supplierreceipting
'}{'
email_bcc
'},
Bcc
=>
$config
->
{'
supplierreceipting
'}{'
email_bcc
'},
'
Reply-To
'
=>
$config
->
{'
supplierreceipting
'}{'
email_reply_to
'},
Subject
=>
"
Receipt:
"
.
$receipt
->
{'
Number
'},
Subject
=>
"
Receipt:
"
.
$receipt
->
{'
Number
'},
Type
=>
'
multipart/mixed
'
Type
=>
'
multipart/mixed
'
);
);
...
@@ -1177,10 +1171,19 @@ sub sendSupplierReceipt
...
@@ -1177,10 +1171,19 @@ sub sendSupplierReceipt
}
}
# Send email
# Send email
my
@SMTPParams
;
my
$server
=
$config
->
{'
mail
'}{'
server
'};
if
(
!
(
my
$res
=
$msg
->
send
("
smtp
",
$server
)))
{
if
(
defined
(
$server
)
&&
$server
ne
"")
{
setError
("
Failed to send supplier receipt via email server '
$server
'
");
# Send email via SMTP
return
ERR_SRVEXEC
;
if
(
!
(
my
$res
=
$msg
->
send
("
smtp
",
$server
)))
{
setError
("
Failed to send supplier receipt via email server '
$server
'
");
return
ERR_SRVEXEC
;
}
}
else
{
# Send email via Sendmail
if
(
!
(
my
$res
=
$msg
->
send
("
sendmail
")))
{
setError
("
Failed to send supplier receipt via sendmail
");
return
ERR_SRVEXEC
;
}
}
}
}
else
{
}
else
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment