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 02:56:28 UTC
svn commit: r703303 - in
/ofbiz/trunk/applications/ecommerce/webapp/ecommerce:
images/checkoutProcess.js order/OnePageCheckoutProcess.ftl
Author: apatel
Date: Thu Oct 9 17:56:28 2008
New Revision: 703303
URL: http://svn.apache.org/viewvc?rev=703303&view=rev
Log:
Updated field Id to match context. No functional changes.
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
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=703303&r1=703302&r2=703303&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js Thu Oct 9 17:56:28 2008
@@ -34,20 +34,20 @@
});
// Update Shipping Address
- Event.observe($('editShippingOptions'), 'click', function() {
+ Event.observe($('savePartyAndShippingContact'), 'click', function() {
if (validateShip.validate()) {
- Effect.Fade('editShippingOptions', {duration: 0.0});
+ Effect.Fade('savePartyAndShippingContact', {duration: 0.0});
Effect.Appear('processingShippingOptions', {duration: 0.0});
if (createUpdateCustomerAndShippingAddress()){
showEditShippingOptionPanel();
}
Effect.Fade('processingShippingOptions', {duration: 0.0});
- Effect.Appear('editShippingOptions', {duration: 0.0});
+ Effect.Appear('savePartyAndShippingContact', {duration: 0.0});
}
});
// Goto Edit Shipping panel
- Event.observe($('editShipping'), 'click', function() {
+ Event.observe($('updateShoppingCart'), 'click', function() {
if (validateCart.validate()) {
showEditShippingPanel();
}
@@ -58,14 +58,14 @@
});
// Set Shipping Method to card and goto Billing step
- Event.observe($('editBilling'), 'click', function() {
- Effect.Fade('editBilling', {duration: 0.0});
+ Event.observe($('saveShippingMethod'), 'click', function() {
+ Effect.Fade('saveShippingMethod', {duration: 0.0});
Effect.Appear('processingBilling', {duration: 0.0});
if (setShippingOption()){
showEditBillingPanel();
}
Effect.Fade('processingBilling', {duration: 0.0});
- Effect.Appear('editBilling', {duration: 0.0});
+ Effect.Appear('saveShippingMethod', {duration: 0.0});
});
Event.observe($('openShippingOptionPanel'), 'click', function() {
@@ -79,16 +79,16 @@
showEditBillingPanel();
});
- Event.observe($('openOrderSubmitPanel'), 'click', function() {
+ Event.observe($('savePaymentAndBillingContact'), 'click', function() {
if (true) {
if (validateBill.validate()) {
- Effect.Fade('openOrderSubmitPanel', {duration: 0.0});
+ Effect.Fade('savePaymentAndBillingContact', {duration: 0.0});
Effect.Appear('processingOrderSubmitPanel', {duration: 0.0});
if (processBillingAndPayment()) {
- showOrderSubmitPanel()
+ showOrderSubmitPanel();
}
Effect.Fade('processingOrderSubmitPanel', {duration: 0.0});
- Effect.Appear('openOrderSubmitPanel', {duration: 0.0});
+ Effect.Appear('savePaymentAndBillingContact', {duration: 0.0});
}
}
});
@@ -228,10 +228,7 @@
var data = transport.responseText.evalJSON(true);
var serverError = getServerError(data);
if (serverError != "") {
- Effect.Appear('shippingFormServerError');
$('shippingFormServerError').update(serverError);
- Effect.Appear('editShippingOptions', {duration: 0.0});
- Effect.Fade('processingShippingOptions', {duration: 0.0});
} else {
Effect.Fade('shippingFormServerError');
// Process Shipping data response.
@@ -356,8 +353,6 @@
Effect.Appear('billingFormServerError');
$('billingFormServerError').update(serverError);
isBillStepValidate = false;
- Effect.Appear('openOrderSubmitPanel', {duration: 0.0});
- Effect.Fade('processingOrderSubmitPanel', {duration: 0.0});
} else {
Effect.Fade('billingFormServerError');
isBillStepValidate = true;
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=703303&r1=703302&r2=703303&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Thu Oct 9 17:56:28 2008
@@ -204,7 +204,7 @@
</table>
</form>
<div align="right">
- <h3><span><a class="buttontext" href="javascript:void(0);" id="editShipping">${uiLabelMap.EcommerceContinueToStep} 2</a></span></h3>
+ <h3><span><a class="buttontext" href="javascript:void(0);" id="updateShoppingCart" >${uiLabelMap.EcommerceContinueToStep} 2</a></span></h3>
<h3><span><a class="buttontext" style="display: none" href="javascript:void(0);" id="processingShipping">${uiLabelMap.EcommercePleaseWait}....</a></span></h3>
</div>
</div>
@@ -370,7 +370,7 @@
</table>
</form>
<div align="right">
- <h3><span><a class="buttontext" href="javascript:void(0);" id="editShippingOptions">${uiLabelMap.EcommerceContinueToStep} 3</a></span></h3>
+ <h3><span><a class="buttontext" href="javascript:void(0);" id="savePartyAndShippingContact">${uiLabelMap.EcommerceContinueToStep} 3</a></span></h3>
<h3><span><a class="buttontext" style="display:none" href="javascript:void(0);" id="processingShippingOptions">${uiLabelMap.EcommercePleaseWait}....</a></span></h3>
</div>
</div>
@@ -412,7 +412,7 @@
</table>
</form>
<div align="right">
- <h3><span><a class="buttontext" href="javascript:void(0);" id="editBilling">${uiLabelMap.EcommerceContinueToStep} 4</a></span></h3>
+ <h3><span><a class="buttontext" href="javascript:void(0);" id="saveShippingMethod">${uiLabelMap.EcommerceContinueToStep} 4</a></span></h3>
<h3><span><a class="buttontext" style="display:none" href="javascript:void(0);" id="processingBilling">${uiLabelMap.EcommercePleaseWait}....</a></span></h3>
</div>
</div>
@@ -647,7 +647,7 @@
</table>
</form>
<div align="right">
- <h3><span><a class="buttontext" href="javascript:void(0);" id="openOrderSubmitPanel">${uiLabelMap.EcommerceContinueToStep} 5</a></span></h3>
+ <h3><span><a class="buttontext" href="javascript:void(0);" id="savePaymentAndBillingContact">${uiLabelMap.EcommerceContinueToStep} 5</a></span></h3>
<h3><span><a class="buttontext" href="javascript:void(0);" style="display: none;" id="processingOrderSubmitPanel">${uiLabelMap.EcommercePleaseWait}....</a></span></h3>
</div>
</div>