\newcommand{\returninset}[1][]{\hspace{-0.25cm}}\r
\r
% New command for address lines i.e. skip them if blank\r
-\newcommand{\addressline}[1]{\ifthenelse{\equal{#1}{}}{}{#1\newline}}\r
+\newcommand{\addressline}[1]{\ifthenelse{\equal{#1}{}}{}{#1\\}}\r
\r
% Inserts dollar symbol\r
\newcommand{\dollar}[1][]{\symbol{36}}\r
%\r
%\r
[@-- $coupon ? '\enlargethispage{-\extracouponspace}' : '' --@]\r
-\begin{tabular}{ll}\r
-\addressinset \rule{0cm}{0cm} &\r
+\addressinset \rule{0.5cm}{0cm} \r
\makebox{\r
\begin{minipage}[t]{5.0cm}\r
\vspace{0.25cm}\r
\addressline{[@-- $city --@], [@-- $state --@]~~[@-- $zip --@]}\r
\addressline{[@-- $country --@]}\r
\end{minipage}}\r
-\end{tabular}\r
\hfill\r
\makebox{\r
\begin{minipage}[t]{6.4cm}\r
\begin{flushright}\r
+[@--\r
+ if ($ship_enable) {\r
+ $OUT .= '\textbf{Service Address}\\\\';\r
+ $OUT .= "\\addressline{$ship_company}";\r
+ $OUT .= "\\addressline{$ship_address1}";\r
+ $OUT .= "\\addressline{$ship_address2}";\r
+ $OUT .= "\\addressline{$ship_city, $ship_state~~$ship_zip}";\r
+ $OUT .= "\\addressline{$ship_country}";\r
+ $OUT .= '~\\\\';\r
+ }else{\r
+ $OUT .= '';\r
+ }\r
+--@]\r
Terms: [@-- $terms --@]\\\r
[@-- $po_line --@]\\\r
\end{flushright}\r