Index: branches/1.2.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl
===================================================================
diff -u -N -r14274 -r14857
--- branches/1.2.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(.../billing_options.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(.../billing_options.elm.tpl)	(revision 14857)
@@ -64,10 +64,43 @@
 		<!-- // credit card CVV2 -->
 
 		<inp2:m_RenderElement design="inp_edit_buttons">
-			<input type="hidden" name="check_credit_card" value="true"/>
+			<input type="hidden" name="check_credit_card" id="check_credit_card" value="0"/>
 			<input type="hidden" name="preview_template" value="in-commerce/checkout/preview">
 
-			<input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_Phrase label="lu_btn_ProceedToPreview" no_editing="1"/>">
+			<input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_Phrase label='lu_btn_ProceedToPreview' no_editing='1'/>">
+
+			<script type="text/javascript">
+				var $submit_event = '';
+
+				$(document).ready(
+					function () {
+						// mark all submit buttons on form ("Update Address" & "Proceed to preview")
+						$("input[type='submit']", '#billing_info').each(
+							function () {
+								var $me = $(this);
+
+								if ( $me.attr('name').match(/^events\[ord\]\[(.*)\]$/) ) {
+									$me
+									.attr('event_name', RegExp.$1)
+									.click(
+										function ($e) {
+											$submit_event = $(this).attr('event_name');
+										}
+									);
+
+								}
+							}
+						);
+
+						$('#billing_info').submit(
+							function ($e) {
+								$('#check_credit_card').val($submit_event == 'OnProceedToPreview' ? 1 : 0);
+							}
+						);
+					}
+				)
+			</script>
+
 		</inp2:m_RenderElement>
 	</table>
 	<br />