"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "dist/standard/etc/ship_notice" between
interchange-5.8.2.tar.gz and interchange-5.10.0.tar.gz

About: Interchange is an Electronic commerce system (supports SSL, PGP/GPG).

ship_notice  (interchange-5.8.2)	:	ship_notice  (interchange-5.10.0)
[loop list="[scratch ship_notice_order_number]"]		[loop list="[scratch ship_notice_order_number]"]
To: [scratch ship_notice_email]		To: [scratch ship_notice_email]
Subject: Your order number [loop-code] has [if scratch ship_now_complete]complet ely shipped![elsif !scratch ship_notice_complete]partially shipped[/elsif][else] shipped![/else][/if]		Subject: Your order #[loop-code] [if-loop-data transactions status eq canceled]w as canceled[else]has [if scratch ship_now_complete]completely shipped[elsif !scr atch ship_notice_complete]partially shipped[/elsif][else]shipped[/else][/if][/el se][/if-loop-data]
From: __COMPANY__ Customer Service <[either]__EMAIL_INFO__[or]__ORDERS_TO__[/eit her]>		From: __COMPANY__ Customer Service <[either]__EMAIL_INFO__[or]__ORDERS_TO__[/eit her]>
Reply-to: [either]__EMAIL_SERVICE__[or]__EMAIL_INFO__[or]__ORDERS_TO__[/either]		Reply-to: [either]__EMAIL_SERVICE__[or]__EMAIL_INFO__[or]__ORDERS_TO__[/either]
Dear [loop-data transactions fname] [loop-data transactions lname],		Dear [loop-data transactions fname] [loop-data transactions lname],
[if scratch ship_now_complete]		[if scratch ship_now_complete]We have made the last shipment of your order #[loo
We have made the last shipment of your order #[loop-code], it is now complete!		p-code], it is now complete!
[elsif scratch ship_notice_complete]		[elsif scratch ship_notice_complete]Your order #[loop-code] has been [if-loop-da
Your order #[loop-code] has been shipped!		ta transactions status eq canceled]canceled. Please contact Customer Service for
[/elsif]		an explanation.[else]shipped![/else][/if-loop-data][/elsif]
[else]		[else]We have made a partial shipment of your order #[loop-code].[/else][/if]
We have made a partial shipment of your order #[loop-code].
[/else]
[/if]
Name: [loop-data transactions fname] [loop-data transactions lname]		Name: [loop-data transactions fname] [loop-data transactions lname]
[if-loop-data transactions company] Company: [loop-data transactions com pany][/if-loop-data]		[if-loop-data transactions company] Company: [loop-data transactions com pany][/if-loop-data]
Email address: [loop-data transactions email]		Email address: [loop-data transactions email]
Address: [loop-data transactions address1][if-loop-data transactions ad dress2]		Address: [loop-data transactions address1][if-loop-data transactions ad dress2]
[loop-data transactions address2][/if-loop-data]		[loop-data transactions address2][/if-loop-data]
City, State, Zip: [loop-data transactions city], [loop-data transactions state] [loop-data transactions zip]		City, State, Zip: [loop-data transactions city], [loop-data transactions state] [loop-data transactions zip]
Country: [loop-data transactions country]		Country: [loop-data transactions country]
skipping to change at line 41		skipping to change at line 35
Daytime Phone: [loop-data transactions phone_day]		Daytime Phone: [loop-data transactions phone_day]
Evening Phone: [loop-data transactions phone_night]		Evening Phone: [loop-data transactions phone_night]
[if-loop-data transactions b_address1]		[if-loop-data transactions b_address1]
Billing Name: [loop-data transactions b_fname] [loop-data transactions b_lna me]		Billing Name: [loop-data transactions b_fname] [loop-data transactions b_lna me]
Billing Address: [loop-data transactions b_address1] [loop-data transactions b_ address2]		Billing Address: [loop-data transactions b_address1] [loop-data transactions b_ address2]
City, State, Zip: [loop-data transactions b_city], [loop-data transactions b_sta te] [loop-data transactions b_zip]		City, State, Zip: [loop-data transactions b_city], [loop-data transactions b_sta te] [loop-data transactions b_zip]
Billing Country: [value b_country]		Billing Country: [value b_country]
[/if-loop-data]		[/if-loop-data]
Quan Item No. Description Price Extension		Qty Item No. Description Price Extension
---- ----------- ------------------------------- -------------- ----------------		---- ----------- ------------------------------- -------------- ----------------
[loop prefix=item search="		[loop prefix=item search="
fi=orderline		fi=orderline
st=db		st=db
sf=order_number		sf=order_number
se=[loop-code]		se=[loop-code]
co=1		co=1
op=eq		op=eq
ml=1000		ml=1000
"][row 82]		"][row 82]
skipping to change at line 117		skipping to change at line 111
[column width=32 align=R wrap=1 gutter=1][/column]		[column width=32 align=R wrap=1 gutter=1][/column]
[column width=15 gutter=1]SHIPPING[/column]		[column width=15 gutter=1]SHIPPING[/column]
[column width=16 align=right gutter=0][currency][loop-data transactions shipping ][/currency][/column]		[column width=16 align=right gutter=0][currency][loop-data transactions shipping ][/currency][/column]
[/row]		[/row]
[row 82]		[row 82]
[column width=5 align=right][/column]		[column width=5 align=right][/column]
[column width=12 gutter=1][/column]		[column width=12 gutter=1][/column]
[column width=32 align=R wrap=1 gutter=1][/column]		[column width=32 align=R wrap=1 gutter=1][/column]
[column width=15 gutter=1]ORDER TOTAL[/column]		[column width=15 gutter=1]ORDER TOTAL[/column]
[column width=16 align = right gutter=0][currency][loop-data transactions total_		[column width=16 align = right gutter=0][currency][either][loop-data transaction
cost][/currency][/column]		s pay_cert_ord_total][or][loop-data transactions total_cost][/either][/currency]
		[/column]
		[/row][if-loop-data transactions pay_cert_total]
		[row 82]
		[column width=5 align=right][/column]
		[column width=12 gutter=1][/column]
		[column width=32 align=R wrap=1 gutter=1][/column]
		[column width=15 gutter=1]GIFT CERT[/column]
		[column width=16 align=right gutter=0][currency][loop-data transactions pay_
		cert_total][/currency][/column]
[/row]		[/row]
		[row 82]
		[column width=5 align=right][/column]
		[column width=12 gutter=1][/column]
		[column width=32 align=R wrap=1 gutter=1][/column]
		[column width=15 gutter=1]CHARGED[/column]
		[column width=16 align=right gutter=0][currency][loop-data transactions tota
		l_cost][/currency][/column]
		[/row]
		[/if-loop-data]
[if-loop-data transactions comments]		[if-loop-data transactions comments]
Your comments or gift note		Your comments or gift note
----------------------------		----------------------------
[loop-data transactions comments]		[loop-data transactions comments]
[/if-loop-data]		[/if-loop-data]
Should you have a question about your items, or about other __COMPANY__		Should you have a question about your items, or about other __COMPANY__
products, please reply to this message and let us help.		products, please reply to this message and let us help.
Remember, you can always visit our site at:		Remember, you can always visit our site at:
End of changes. 5 change blocks.
14 lines changed or deleted		28 lines changed or added

---