You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2008/10/10 03:27:54 UTC
svn commit: r703308 -
/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js
Author: apatel
Date: Thu Oct 9 18:27:53 2008
New Revision: 703308
URL: http://svn.apache.org/viewvc?rev=703308&view=rev
Log:
Misc cleanup.
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=703308&r1=703307&r2=703308&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js Thu Oct 9 18:27:53 2008
@@ -69,27 +69,23 @@
});
Event.observe($('openShippingOptionPanel'), 'click', function() {
- if (true) {
- showEditShippingOptionPanel();
- }
+ showEditShippingOptionPanel();
});
// Billing
Event.observe($('openBillingPanel'), 'click', function() {
- showEditBillingPanel();
+ showEditBillingPanel();
});
Event.observe($('savePaymentAndBillingContact'), 'click', function() {
- if (true) {
- if (validateBill.validate()) {
- Effect.Fade('savePaymentAndBillingContact', {duration: 0.0});
- Effect.Appear('processingOrderSubmitPanel', {duration: 0.0});
- if (processBillingAndPayment()) {
- showOrderSubmitPanel();
- }
- Effect.Fade('processingOrderSubmitPanel', {duration: 0.0});
- Effect.Appear('savePaymentAndBillingContact', {duration: 0.0});
+ if (validateBill.validate()) {
+ Effect.Fade('savePaymentAndBillingContact', {duration: 0.0});
+ Effect.Appear('processingOrderSubmitPanel', {duration: 0.0});
+ if (processBillingAndPayment()) {
+ showOrderSubmitPanel();
}
+ Effect.Fade('processingOrderSubmitPanel', {duration: 0.0});
+ Effect.Appear('savePaymentAndBillingContact', {duration: 0.0});
}
});
@@ -187,7 +183,7 @@
if (!$('editShippingOptionPanel').visible()) {
Effect.BlindUp('shippingOptionSummaryPanel', {duration: 0.0});
hideEditCartPanel();
- hideEditShippingPanel()
+ hideEditShippingPanel();
hideEditBillingPanel();
hideOrderSubmitPanel();
Effect.BlindDown('editShippingOptionPanel', {duration: 0.0});
@@ -209,8 +205,8 @@
function showOrderSubmitPanel() {
if (!$('orderSubmitPanel').visible()) {
hideEditCartPanel();
- hideEditShippingPanel()
- hideEditShippingOptionPanel()
+ hideEditShippingPanel();
+ hideEditShippingOptionPanel();
hideEditBillingPanel();
Effect.BlindDown('orderSubmitPanel', {duration: 0.0});
}
@@ -233,7 +229,6 @@
Effect.Fade('shippingFormServerError');
// Process Shipping data response.
$('shipToPartyId').value = data.partyId;
- console.log("data.partyId " + $('shipToPartyId').value);
$('billToPartyId').value = data.partyId;
$('shipToContactMechId').value = data.shipToContactMechId;
$('shipToPhoneContactMechId').value = data.shipToPhoneContactMechId;
@@ -255,7 +250,6 @@
$('completedShipToGeo').update(shipToGeo);
// set shipToContactMechId in Billing form.
$('shipToContactMechIdInBillingForm').value = $F('shipToContactMechId');
-
getShipOptions();
result = true;
}
@@ -323,7 +317,6 @@
}, parameters: $('shippingOptionForm').serialize(), requestHeaders: {Accept: 'application/json'}
});
updateCartData();
- console.log("Return value in setShippingOption is " + result);
return result;
}
@@ -381,7 +374,6 @@
}
}, parameters: $('billingForm').serialize(), requestHeaders: {Accept: 'application/json'}
});
- console.log("processBillingAndPayment return value is " + result);
return result;
}