Index: branches/1.0.x/checkout.tpl
===================================================================
diff -u -N -r14806 -r14814
--- branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 14806)
+++ branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 14814)
@@ -99,11 +99,11 @@
 				<fieldset>
 					<div class="fieldset">
 						<label>
-							<input type="checkbox" id="same_as_billing" name="same_as_billing" value="1"<inp2:m_if check="m_Get" name="same_as_billing"> checked</inp2:m_if>/> Ship To Address is the same as Billing
+							<input type="checkbox" id="same_as_billing" name="same_as_billing" value="1"<inp2:m_if check="ord_AddressesTheSame"> checked</inp2:m_if>/> Ship To Address is the same as Billing
 						</label>
 					</div>
 
-					<div id="shipping-address"<inp2:m_if check="m_Get" name="same_as_billing"> style="display: none;"</inp2:m_if>>
+					<div id="shipping-address"<inp2:m_if check="ord_AddressesTheSame"> style="display: none;"</inp2:m_if>>
 						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="lu_fld_FullName"/>
 						<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"/>
@@ -115,16 +115,11 @@
 						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="lu_fld_Zip" row_class="alt2"/>
 					</div>
 
-					<p>
-						<label for="ship">How would you like the items shipped? <span class="star">*</span></label>
-						<select id="ship" class="field">
-							<option value="" selected="selected">FedEx Ground (Next Day) $14.00</option>
-							<option value="">USA</option>
-							<option value="">Russia</option>
-						</select>
+					<p id="shipping-type-container">
+						<inp2:m_include template="elements/ajax/shipping_type"/>
 					</p>
 
-					<div class="safe-shop" id="shipping-address-placeholder"<inp2:m_ifnot check="m_Get" name="same_as_billing"> style="display: none;"</inp2:m_ifnot>>
+					<div class="safe-shop" id="shipping-address-placeholder"<inp2:m_ifnot check="ord_AddressesTheSame"> style="display: none;"</inp2:m_ifnot>>
 						<p class="title">100% Safe & Secure Shopping</p>
 						<ul class="list">
 							<li>All Transactions are Encrypted</li>
@@ -136,7 +131,7 @@
 				</fieldset>
 				<fieldset>
 					<div class="fieldset">
-						Your Order Summary (18 Items)
+						Your Order Summary (<inp2:orditems_TotalRecords/> Items)
 						<a href="#" class="link">View Order Details</a>
 					</div>
 					<dl class="total">
@@ -171,23 +166,164 @@
 	</div>
 
 	<script type="text/javascript">
-		$(document).ready(
-			function () {
-				$('#same_as_billing').click(
-					function ($e) {
-						var $checked = $(this).is(':checked');
+		function CheckoutManager() {}
 
-						$('#shipping-address').toggle(!$checked);
-						$('#shipping-address-placeholder').toggle($checked);
+		CheckoutManager.sameAsBilling = <inp2:m_if check="ord_AddressesTheSame">true<inp2:m_else/>false</inp2:m_if>;
+		CheckoutManager.addressFields = ['To', 'Company', 'Address1', 'Address2', 'City', 'Country', 'State', 'Zip'];
+
+		CheckoutManager.initAddressFields = function () {
+			var $me = this;
+
+			$(this.addressFields).each(
+				function () {
+					var $field = this.toString();
+
+					$( FormManager.getField('ord', 'Billing' + $field) ).change(
+						function ($e) {
+							if ( $me.sameAsBilling ) {
+								$( FormManager.getField('ord', 'Shipping' + $field) ).val( $(this).val() ).change();
+							}
+						}
+					);
+
+					$( FormManager.getField('ord', 'Shipping' + $field) ).change(
+						function ($e) {
+							if ( $me.isAddressValid('Shipping') ) {
+								$me.updateOrder(
+									'elements/ajax/shipping_type',
+									function ($data) {
+										$('#shipping-type-container').html($data);
+									}
+								);
+							}
+						}
+					);
+				}
+			);
+		}
+
+		CheckoutManager.isAddressValid = function ($type) {
+			var $status = true;
+
+			$(this.addressFields).each(
+				function () {
+					var $field = this.toString(),
+						$input = $( FormManager.getField('ord', $type + $field) );
+
+					if ( $field == 'Address2' || ($input.is('select') && $('option', $input).length <= 2 ) ) {
+						// 2nd address line or empty state dropdown
+						return true;
 					}
-				);
 
-				$('#create_account').click(
-					function ($e) {
-						$('.password-block').toggle( $(this).is(':checked') );
+					if ( $input.val() == '' ) {
+						$status = false;
+
+						return false;
 					}
-				);
+				}
+			);
 
+			return $status;
+		}
+
+		CheckoutManager.updateOrder = function ($return_template, $callback) {
+			var $me = this,
+				$params = $('#checkout-form').serializeArray(),
+				$remove_fields = ['check_billing_address', 'check_shipping_address', 'check_credit_card'];
+
+			for (var $i in $params) {
+				if ( in_array($params[$i].name, $remove_fields) ) {
+					delete $params[$i];
+				}
+			}
+
+			$.post(
+				FormManager.getURL('ord', $return_template, 'OnUpdate'),
+				$params,
+				function ($data) {
+					var $redirect = TB.parseRedirect($data);
+
+					if ( $redirect !== false ) {
+						window.location.href = $redirect;
+
+						return ;
+					}
+
+					$callback.apply($me, [$data]);
+				}
+			)
+		}
+
+		CheckoutManager.copyAddress = function () {
+			$(this.addressFields).each(
+				function () {
+					var $field = this.toString();
+
+					$( FormManager.getField('ord', 'Shipping' + $field) ).val( $( FormManager.getField('ord', 'Billing' + $field) ).val() );
+				}
+			);
+
+			$( FormManager.getField('ord', 'ShippingAddress1') ).change();
+		}
+
+		CheckoutManager.init = function () {
+			var $me = this;
+
+			this.sameAsBilling = $('#same_as_billing').is(':checked');
+
+			$('#same_as_billing').click(
+				function ($e) {
+					$me.sameAsBilling = $(this).is(':checked');
+
+					if ($me.sameAsBilling) {
+						$me.copyAddress();
+					}
+
+					$('#shipping-address').toggle(!$me.sameAsBilling);
+					$('#shipping-address-placeholder').toggle($me.sameAsBilling);
+				}
+			);
+
+			$('#create_account').click(
+				function ($e) {
+					$('.password-block').toggle( $(this).is(':checked') );
+				}
+			);
+
+			$('#login-alt').click(
+				function ($e) {
+					var $login_link = $('#login');
+
+					if ( !$login_link.parents('.login:first').hasClass('plashka-sel') ) {
+						$login_link.click();
+					}
+
+					return false;
+				}
+			);
+
+			$('body').bind(
+				'OnAfterLogin',
+				function ($e, $params) {
+					// 1. remove login button
+					$('.login-alt').remove();
+
+					// 2. remove user password controls
+					$('#create-account-password, .badge-optional').remove();
+					FormManager.unregisterField('ord', 'UserPassword');
+					FormManager.unregisterField('ord', 'VerifyUserPassword');
+
+					// 3. put user e-mail into the form
+					FormManager.setFieldStatus('ord', 'BillingEmail');
+					FormManager.getField('ord', 'BillingEmail').value = $params['user_email'];
+				}
+			)
+
+			this.initAddressFields();
+		}
+
+		$(document).ready(
+			function () {
 				FormManager.registerForm(
 					{
 						prefix: 'ord',
@@ -213,34 +349,7 @@
 					}
 				);
 
-				$('#login-alt').click(
-					function ($e) {
-						var $login_link = $('#login');
-
-						if ( !$login_link.parents('.login:first').hasClass('plashka-sel') ) {
-							$login_link.click();
-						}
-
-						return false;
-					}
-				);
-
-				$('body').bind(
-					'OnAfterLogin',
-					function ($e, $params) {
-						// 1. remove login button
-						$('.login-alt').remove();
-
-						// 2. remove user password controls
-						$('#create-account-password, .badge-optional').remove();
-						FormManager.unregisterField('ord', 'UserPassword');
-						FormManager.unregisterField('ord', 'VerifyUserPassword');
-
-						// 3. put user e-mail into the form
-						FormManager.setFieldStatus('ord', 'BillingEmail');
-						FormManager.getField('ord', 'BillingEmail').value = $params['user_email'];
-					}
-				)
+				CheckoutManager.init();
 			}
 		);
 
Index: branches/1.0.x/elements/ajax/shipping_type.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/ajax/shipping_type.tpl	(revision 0)
+++ branches/1.0.x/elements/ajax/shipping_type.tpl	(revision 14814)
@@ -0,0 +1,10 @@
+<inp2:m_if check="m_Get" name="ajax" equals_to="yes">
+	shipping types here: <inp2:ord_Field name="OrderId"/>
+</inp2:m_if>
+
+<label for="ship">How would you like the items shipped? <span class="star">*</span></label>
+<select id="ship" class="field">
+	<option value="" selected="selected">FedEx Ground (Next Day) $14.00</option>
+	<option value="">USA</option>
+	<option value="">Russia</option>
+</select>
\ No newline at end of file