[interchange-cvs] interchange - heins modified 2 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Tue Apr 13 11:38:32 EDT 2004


User:      heins
Date:      2004-04-13 15:38:31 GMT
Modified:  dist/lib/UI/pages/admin order_status.html
Modified:  dist/foundation/etc ship_notice
Log:
* Update ship status stuff to send a message "Your order has been CANCELED"
  (instead of "partially shipped") when an order is canceled.

Revision  Changes    Path
2.17      +5 -2      interchange/dist/lib/UI/pages/admin/order_status.html


rev 2.17, prev_rev 2.16
Index: order_status.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/order_status.html,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -r2.16 -r2.17
--- order_status.html	9 Dec 2003 23:10:10 -0000	2.16
+++ order_status.html	13 Apr 2004 15:38:31 -0000	2.17
@@ -115,7 +115,10 @@
 	mv_todo=back
 	order=[cgi code]
 	[tag flag write]orderline transactions[/tag]
-	[update-order-status order-number="[cgi code]"]
+	[update-order-status
+		order-number="[cgi code]"
+		cancel-order="[if cgi ship_all eq 2]1[/if]"
+	]
 	[if scratch ship_notice_username]
 	[email-raw][include etc/ship_notice][/email-raw]
 	[/if]
@@ -187,4 +190,4 @@
 </script>
 
 @_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ version: $Id: order_status.html,v 2.16 2003/12/09 23:10:10 mheins Exp $ -->
+<!-- page: @@MV_PAGE@@ version: $Id: order_status.html,v 2.17 2004/04/13 15:38:31 mheins Exp $ -->



2.2       +7 -10     interchange/dist/foundation/etc/ship_notice


rev 2.2, prev_rev 2.1
Index: ship_notice
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/etc/ship_notice,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- ship_notice	20 Nov 2003 22:11:30 -0000	2.1
+++ ship_notice	13 Apr 2004 15:38:31 -0000	2.2
@@ -1,20 +1,17 @@
 [loop list="[scratch ship_notice_order_number]"]
 To: [scratch ship_notice_email]
-Subject: Your order number [loop-code] has [if scratch ship_now_complete]completely shipped![elsif !scratch ship_notice_complete]partially shipped[/elsif][else]shipped![/else][/if]
+Subject: Your order number [loop-code] has [if cgi ship_all eq 2]been CANCELED.[elsif scratch ship_now_complete]completely shipped![/elsif][elsif !scratch ship_notice_complete]partially shipped[/elsif][else]shipped![/else][/if]
 From: __COMPANY__ Customer Service <[either]__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],
 
-[if scratch ship_now_complete]
-We have made the last shipment of your order #[loop-code], it is now complete!
-[elsif scratch ship_notice_complete]
-Your order #[loop-code] has been shipped!
-[/elsif]
-[else]
-We have made a partial shipment of your order #[loop-code].
-[/else]
-[/if]
+[if cgi ship_all eq 2]Your order has been canceled.
+[elsif scratch ship_now_complete]We have made the last shipment of your order #[loop-code],
+it is now complete!
+[/elsif][elsif scratch ship_notice_complete]Your order #[loop-code] has been shipped!
+[/elsif][else]We have made a partial shipment of your order #[loop-code].
+[/else][/if]
 
             Name: [loop-data transactions fname] [loop-data transactions lname]
 [if-loop-data transactions company]         Company: [loop-data transactions company][/if-loop-data]








More information about the interchange-cvs mailing list