Index: branches/1.0.x/checkout.tpl
===================================================================
diff -u -r14817 -r14822
--- branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 14817)
+++ branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 14822)
@@ -50,7 +50,7 @@
 					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCompany" title="lu_fld_Company"/>
 					<inp2:m_RenderElement name="inp_edit_address" prefix="ord" field="BillingAddress1" field2="BillingAddress2" title="lu_fld_Address"/>
 					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="lu_fld_City"/>
-					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="lu_fld_Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
+					<inp2:m_RenderElement name="inp_edit_country" prefix="ord" field="BillingCountry" state_field="BillingState" title="lu_fld_Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
 
 					<!-- TODO: preload states by country -->
 					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingState" title="lu_fld_State" has_empty="1" row_class="alt1"/>
@@ -63,23 +63,50 @@
 						Payment Information
 					</div>
 					<div class="creditcards">
-						<span><img src="<inp2:m_TemplatesBase/>img/creditcards.jpg" width="245" height="39" alt="" /></span>
-						<span class="paypal"><img src="<inp2:m_TemplatesBase/>img/paypal.jpg" width="98" height="45" alt="" /></span>
+						<inp2:m_if check='ord_UsingCreditCard'>
+							<span><img src="<inp2:m_TemplatesBase/>img/creditcards.jpg" width="245" height="39" alt="" /></span>
+						</inp2:m_if>
+
+						<inp2:m_if check="pt.gw-paypal_Field" name="PaymentTypeId" gateway="PayPal">
+							<span<inp2:m_if check='ord_UsingCreditCard'> class="paypal"</inp2:m_if>>
+								<a href="#" id="paypal" payment_type="<inp2:pt.gw-paypal_Field name='PaymentTypeId' gateway='PayPal'/>">
+									<img src="<inp2:m_TemplatesBase/>img/paypal.jpg" width="98" height="45" alt="" />
+								</a>
+							</span>
+
+							<script type="text/javascript">
+								$(document).ready(
+									function () {
+										$('#paypal').click(
+											function ($e) {
+												FormManager.getField('ord', 'PaymentType').value = $(this).attr('payment_type');
+												FormManager.submitForm('ord');
+
+												return false;
+											}
+										);
+									}
+								);
+							</script>
+						</inp2:m_if>
 					</div>
 
-					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="lu_fld_CreditCardNumber"/>
+					<inp2:m_if check='ord_UsingCreditCard'>
+						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="lu_fld_CreditCardNumber"/>
 
-					<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="lu_fld_ExpirationDate" row_class="alt1 expdate" field_type="cc_expiration">
-						<select class="field" name="<inp2:ord_InputName field='PaymentCCExpMonth'/>" id="<inp2:ord_InputName field='PaymentCCExpMonth'/>">
-							<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="inp_option_item" selected="selected"/>
-						</select> /
-						<select class="field" name="<inp2:ord_InputName field='PaymentCCExpYear'/>" id="<inp2:ord_InputName field='PaymentCCExpYear'/>">
-							<option value=''></option>
-							<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="inp_option_item" selected="selected"/>
-						</select>
-					</inp2:m_RenderElement>
+						<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="lu_fld_ExpirationDate" row_class="alt1 expdate" field_type="cc_expiration">
+							<select class="field" name="<inp2:ord_InputName field='PaymentCCExpMonth'/>" id="<inp2:ord_InputName field='PaymentCCExpMonth'/>">
+								<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="inp_option_item" selected="selected"/>
+							</select> /
+							<select class="field" name="<inp2:ord_InputName field='PaymentCCExpYear'/>" id="<inp2:ord_InputName field='PaymentCCExpYear'/>">
+								<option value=''></option>
+								<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="inp_option_item" selected="selected"/>
+							</select>
+						</inp2:m_RenderElement>
 
-					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentCVV2" title="lu_fld_SecurityCode" row_class="alt2"/>
+						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentCVV2" title="lu_fld_SecurityCode" row_class="alt2"/>
+						<input type="hidden" name="check_credit_card" id="check_credit_card" value="true"/>
+					</inp2:m_if>
 				</fieldset>
 			</div>
 
@@ -108,7 +135,7 @@
 						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="lu_fld_Company"/>
 						<inp2:m_RenderElement name="inp_edit_address" prefix="ord" field="ShippingAddress1" field2="ShippingAddress2" title="lu_fld_Address"/>
 						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="lu_fld_City"/>
-						<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="lu_fld_Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
+						<inp2:m_RenderElement name="inp_edit_country" prefix="ord" field="ShippingCountry" state_field="ShippingState" title="lu_fld_Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
 
 						<!-- TODO: preload states by country -->
 						<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingState" title="lu_fld_State" has_empty="1" row_class="alt1"/>
@@ -135,16 +162,7 @@
 						<a href="#" class="link">View Order Details</a>
 					</div>
 					<dl class="total">
-						<dt>Subtotal</dt>
-						<dd>$1,759.99</dd>
-						<dt class="discount">Discount:</dt>
-						<dd class="price2">- $10.00</dd>
-						<dt>Shipping</dt>
-						<dd class="price3">$100.00</dd>
-						<dt>Tax</dt>
-						<dd class="price3">$100.00</dd>
-						<dt>Order Total</dt>
-						<dd class="price4">$1,959.99</dd>
+						<inp2:m_include template="elements/ajax/order_totals"/>
 					</dl>
 					<div class="clear"></div>
 					<div class="terms">
@@ -158,11 +176,11 @@
 			<div class="clear"></div>
 
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="ord" field="PaymentType" db="db"/>
-
 			<input type="hidden" name="check_billing_address" id="check_billing_address" value="true"/>
 			<input type="hidden" name="check_shipping_address" id="check_shipping_address" value="true"/>
-			<input type="hidden" name="check_credit_card" id="check_credit_card" value="true"/>
 		</form>
+
+		<inp2:m_include template="elements/ajax/payment_form"/>
 	</div>
 
 	<script type="text/javascript">
@@ -229,10 +247,13 @@
 			return $status;
 		}
 
-		CheckoutManager.updateOrder = function ($return_template, $callback) {
+		CheckoutManager.updateOrder = function ($return_template, $callback, $remove_fields) {
 			var $me = this,
-				$params = $('#checkout-form').serializeArray(),
+				$params = $('#checkout-form').serializeArray();
+
+			if ( $remove_fields === undefined ) {
 				$remove_fields = ['check_billing_address', 'check_shipping_address', 'check_credit_card'];
+			}
 
 			for (var $i in $params) {
 				if ( in_array($params[$i].name, $remove_fields) ) {
@@ -330,9 +351,20 @@
 				FormManager.registerForm(
 					{
 						prefix: 'ord',
-						save_event: 'OnCombinedPlaceOrder',
+						save_event: 'OnUpdateAjax',
 						id: '<inp2:ord_Field name="OrderId"/>',
-						form_id: 'checkout-form'
+						form_id: 'checkout-form',
+						before_close: function ($data, $add_params) {
+							// when all form data is valid
+
+							CheckoutManager.updateOrder(
+								'elements/ajax/payment_form',
+								function ($data) {
+									$('#payment-form').replaceWith($data);
+									$('#payment-form').submit();
+								}
+							);
+						}
 					}
 				);
 
@@ -344,14 +376,6 @@
 					}
 				);
 
-				$('#checkout-form').submit(
-					function ($e) {
-						FormManager.submitForm('ord');
-
-						return false;
-					}
-				);
-
 				CheckoutManager.init();
 			}
 		);