You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2003/11/10 05:12:32 UTC
cvs commit: cocoon-2.1/src/blocks/petstore/samples/flow PetStoreImpl.js petstore.js
crossley 2003/11/09 20:12:32
Modified: src/blocks/petstore/samples sitemap.xmap
src/blocks/petstore/samples/flow PetStoreImpl.js petstore.js
Log:
Whitespace cleanup only, no code changes.
Getting ready for next patch, to reduce apparent changes.
Revision Changes Path
1.5 +67 -68 cocoon-2.1/src/blocks/petstore/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 29 Jul 2003 03:15:46 -0000 1.4
+++ sitemap.xmap 10 Nov 2003 04:12:32 -0000 1.5
@@ -2,14 +2,14 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Components ================================ -->
- <map:components>
+<!-- ======================== Components =========================== -->
+ <map:components>
<map:transformers default="xslt">
<map:transformer name="jx" src="org.apache.cocoon.transformation.JXTemplateTransformer" logger="jx.sitemap.transformer"/>
</map:transformers>
<map:generators default="file">
- <map:generator label="content" logger="sitemap.generator.velocity" name="velocity" src="org.apache.cocoon.generation.VelocityGenerator"/>
- <map:generator label="content" logger="sitemap.generator.jx" name="jx" src="org.apache.cocoon.generation.JXTemplateGenerator"/>
+ <map:generator label="content" logger="sitemap.generator.velocity" name="velocity" src="org.apache.cocoon.generation.VelocityGenerator"/>
+ <map:generator label="content" logger="sitemap.generator.jx" name="jx" src="org.apache.cocoon.generation.JXTemplateGenerator"/>
<map:generator name="jxforms" src="org.apache.cocoon.generation.JXFormsGenerator" logger="sitemap.generator.jxforms"/>
</map:generators>
<map:flow-interpreters default="javascript"/>
@@ -17,11 +17,9 @@
<map:matchers default="wildcard"/>
</map:components>
-
-<!-- =========================== Views =================================== -->
-
+<!-- ======================== Views ================================ -->
<!--
- The debug view can be used to output an intermediate
+ The debug view can be used to output an intermediate
snapshot of the pipeline.
Pass cocoon-view=debug as a URL parameter to see
the pipeline output produced by the transofrmer
@@ -29,48 +27,48 @@
transformers to understand each processing
stage better.
-->
-<map:views>
- <map:view name="debug" from-label="debug">
- <map:serialize type="xml"/>
- </map:view>
- <map:view name="debug1" from-label="debug1">
- <map:serialize type="xml"/>
- </map:view>
- <map:view name="debug2" from-label="debug2">
- <map:serialize type="xml"/>
- </map:view>
- <map:view name="xml" from-label="xml">
- <map:serialize type="xml"/>
- </map:view>
-</map:views>
-
- <!-- =========================== Resources ================================= -->
+ <map:views>
+ <map:view name="debug" from-label="debug">
+ <map:serialize type="xml"/>
+ </map:view>
+ <map:view name="debug1" from-label="debug1">
+ <map:serialize type="xml"/>
+ </map:view>
+ <map:view name="debug2" from-label="debug2">
+ <map:serialize type="xml"/>
+ </map:view>
+ <map:view name="xml" from-label="xml">
+ <map:serialize type="xml"/>
+ </map:view>
+ </map:views>
+<!-- ======================== Resources ============================ -->
<map:resources>
</map:resources>
- <!-- =========================== Pipelines ================================= -->
- <map:flow language="javascript">
- <map:script src="flow/PetStoreImpl.js"/>
- <map:script src="flow/petstore.js"/>
- </map:flow>
- <map:pipelines>
+<!-- ======================== Flow ================================= -->
+ <map:flow language="javascript">
+ <map:script src="flow/PetStoreImpl.js"/>
+ <map:script src="flow/petstore.js"/>
+ </map:flow>
+
+<!-- ======================== Pipelines ============================ -->
+ <map:pipelines>
<map:pipeline>
<map:match pattern="*.kont">
- <map:call continuation="{1}"/> <!--
- This handles sendPage*() continuations.
- -->
+ <!-- This handles sendPage*() continuations.-->
+ <map:call continuation="{1}"/>
</map:match>
<map:match pattern="*.do">
<map:call function="main">
<map:parameter name="page" value="{1}"/>
</map:call>
</map:match>
- <map:match pattern="petstore">
- <map:call function="jxform"/> <!--
+ <map:match pattern="petstore">
+ <map:call function="jxform"/> <!--
Without parameters jxform() handles continuations:
- The pattern I'm matching here, "petstore", must match the value
+ The pattern I'm matching here, "petstore", must match the value
of the "action" attribute in the view's <xf:submit> element
-->
</map:match>
@@ -80,8 +78,8 @@
<map:match pattern="editAccount.form">
<map:call function="jxform">
<map:parameter name="function" value="editAccountForm"/>
- <map:parameter name="id" value="petstore-edit-account"/> <!--
- The value I supply here, "petstore-edit-account", must match
+ <map:parameter name="id" value="petstore-edit-account"/> <!--
+ The value I supply here, "petstore-edit-account", must match
the "id" attribute of the view's <xf:form> element
-->
<map:parameter name="validator-schema-ns"/> <!-- no validator -->
@@ -90,56 +88,57 @@
</map:match>
<map:match pattern="view/jxforms/*.xml">
- <!-- original JXForms document -->
- <map:generate type="jxforms" src="view/jxforms/{1}.xml"/>
+ <!-- original JXForms document -->
+ <map:generate type="jxforms" src="view/jxforms/{1}.xml"/>
- <map:transform type="xalan" src="stylesheets/form2html.xsl" label="debug1"/>
+ <map:transform type="xalan" src="stylesheets/form2html.xsl" label="debug1"/>
- <map:transform type="xalan" src="../jxforms/stylesheets/jxforms2html.xsl" />
+ <map:transform type="xalan" src="../jxforms/stylesheets/jxforms2html.xsl" />
- <map:transform type="xalan" src="stylesheets/site2html.xsl" label="debug1"/>
+ <map:transform type="xalan" src="stylesheets/site2html.xsl" label="debug1"/>
- <map:serialize type="html" />
- </map:match>
+ <map:serialize type="html" />
+ </map:match>
</map:pipeline>
- <map:pipeline>
- <map:match pattern="view/*.xsp">
+
+ <map:pipeline>
+ <map:match pattern="view/*.xsp">
<map:generate src="view/xsp/{1}.xsp" type="serverpages"/>
<map:transform src="stylesheets/site2html.xsl" />
<map:serialize type="html"/>
- </map:match>
- <map:match pattern="view/Cart.jxpath">
+ </map:match>
+ <map:match pattern="view/Cart.jxpath">
<map:generate src="view/jxpath/Cart.xml" type="jx" />
<map:serialize type="html"/>
- </map:match>
- <map:match pattern="view/*.jxpath">
+ </map:match>
+ <map:match pattern="view/*.jxpath">
<map:generate src="view/jxpath/{1}.xml" type="file" />
<map:transform type="jx" />
<map:transform src="stylesheets/site2html.xsl" />
<map:serialize type="html"/>
- </map:match>
- <map:match pattern="view/Cart.jexl">
+ </map:match>
+ <map:match pattern="view/Cart.jexl">
<map:generate src="view/jexl/Cart.xml" type="jx" />
<map:serialize type="html"/>
- </map:match>
- <map:match pattern="view/*.jexl">
+ </map:match>
+ <map:match pattern="view/*.jexl">
<map:generate src="view/jexl/{1}.xml" type="jx" />
<map:transform src="stylesheets/site2html.xsl" />
<map:serialize type="html"/>
- </map:match>
- <map:match pattern="view/*.vm">
- <map:generate src="view/templates/{1}.vm" type="velocity"/>
- <map:serialize type="html"/>
- </map:match>
- </map:pipeline>
-
- <map:pipeline>
- <map:match pattern="images/*.gif">
- <map:read mime-type="images/gif" src="images/{1}.gif"/>
- </map:match>
- </map:pipeline>
+ </map:match>
+ <map:match pattern="view/*.vm">
+ <map:generate src="view/templates/{1}.vm" type="velocity"/>
+ <map:serialize type="html"/>
+ </map:match>
+ </map:pipeline>
+
+ <map:pipeline>
+ <map:match pattern="images/*.gif">
+ <map:read mime-type="images/gif" src="images/{1}.gif"/>
+ </map:match>
+ </map:pipeline>
- </map:pipelines>
+ </map:pipelines>
</map:sitemap>
<!-- end of file -->
1.2 +94 -94 cocoon-2.1/src/blocks/petstore/samples/flow/PetStoreImpl.js
Index: PetStoreImpl.js
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/flow/PetStoreImpl.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PetStoreImpl.js 10 Jul 2003 23:48:53 -0000 1.1
+++ PetStoreImpl.js 10 Nov 2003 04:12:32 -0000 1.2
@@ -48,7 +48,7 @@
function OrderForm() {
this.order = new Order();
- this.shippingAddressRequired = false;
+ this.shippingAddressRequired = false;
this.confirmed = false;
}
@@ -69,10 +69,10 @@
this.order.billZip = acct.zip;
this.order.billCountry = acct.country;
this.order.totalPrice = cartForm.cart.subTotal;
- this.order.billToFirstName= acct.firstName;
- this.order.billToLastName= acct.lastName;
- this.order.shipToFirstName= acct.firstName;
- this.order.shipToLastName= acct.lastName;
+ this.order.billToFirstName = acct.firstName;
+ this.order.billToLastName = acct.lastName;
+ this.order.shipToFirstName = acct.firstName;
+ this.order.shipToLastName = acct.lastName;
this.order.shipDate = new java.util.Date();
for (var i in cartForm.cart.cartItems) {
var cartItem = cartForm.cart.cartItems[i];
@@ -82,53 +82,53 @@
function Order() {
this.orderId = 0;
- this.username= "";
- this.orderDate =null;
- this.shipAddress1= "";
- this.shipAddress2= "";
- this.shipCity= "";
- this.shipState= "";
- this.shipZip= "";
- this.shipCountry= "";
- this.billAddress1= "";
- this.billAddress2= "";
- this.billCity= "";
- this.billState= "";
- this.billZip= "";
- this.billCountry= "";
- this.courier= "";
- this.totalPrice= 0;
- this.billToFirstName= "";
- this.billToLastName= "";
- this.shipToFirstName= "";
- this.shipToLastName= "";
- this.creditCard= "";
- this.expiryDate= "";
- this.cardType= "";
- this.locale= "";
- this.status= "";
+ this.username = "";
+ this.orderDate = null;
+ this.shipAddress1 = "";
+ this.shipAddress2 = "";
+ this.shipCity = "";
+ this.shipState = "";
+ this.shipZip = "";
+ this.shipCountry = "";
+ this.billAddress1 = "";
+ this.billAddress2 = "";
+ this.billCity = "";
+ this.billState = "";
+ this.billZip = "";
+ this.billCountry = "";
+ this.courier = "";
+ this.totalPrice = 0;
+ this.billToFirstName = "";
+ this.billToLastName = "";
+ this.shipToFirstName = "";
+ this.shipToLastName = "";
+ this.creditCard = "";
+ this.expiryDate = "";
+ this.cardType = "";
+ this.locale = "";
+ this.status = "";
this.lineItems = [];
}
function Account() {
- this.username ="";
+ this.username = "";
this.password = "";
this.email = "";
this.firstName = "";
this.lastName = "";
this.status = "";
this.address1 = "";
- this.address2= "";
- this.city= "";
- this.state= "";
- this.zip= "";
- this.country= "";
- this.phone= "";
- this.favouriteCategoryId= "";
- this.languagePreference= "";
- this.listOption= false;
- this.bannerOption= false;
- this.bannerName= "";
+ this.address2 = "";
+ this.city = "";
+ this.state = "";
+ this.zip = "";
+ this.country = "";
+ this.phone = "";
+ this.favouriteCategoryId = "";
+ this.languagePreference = "";
+ this.listOption = false;
+ this.bannerOption = false;
+ this.bannerName = "";
}
function AccountForm(username, password) {
@@ -226,10 +226,10 @@
" email varchar(80) not null," +
" firstname varchar(80) not null," +
" lastname varchar(80) not null," +
-" status varchar(2) null," +
+" status varchar(2) null," +
" addr1 varchar(80) not null," +
" addr2 varchar(40) null," +
-" city varchar(80) not null," +
+" city varchar(80) not null," +
" state varchar(80) not null," +
" zip varchar(20) not null," +
" country varchar(20) not null," +
@@ -248,61 +248,61 @@
"" +
"create table bannerdata (" +
" favcategory varchar(80) not null," +
-" bannername varchar(255) null" +
+" bannername varchar(255) null" +
//" ,constraint pk_bannerdata primary key (favcategory)" +
");" +
"" +
"create table orders (" +
-" orderid int not null," +
-" userid varchar(80) not null," +
-" orderdate date not null," +
-" shipaddr1 varchar(80) not null," +
-" shipaddr2 varchar(80) null," +
-" shipcity varchar(80) not null," +
-" shipstate varchar(80) not null," +
-" shipzip varchar(20) not null," +
-" shipcountry varchar(20) not null," +
-" billaddr1 varchar(80) not null," +
-" billaddr2 varchar(80) null," +
-" billcity varchar(80) not null," +
-" billstate varchar(80) not null," +
-" billzip varchar(20) not null," +
-" billcountry varchar(20) not null," +
-" courier varchar(80) not null," +
-" totalprice decimal(10,2) not null," +
-" billtofirstname varchar(80) not null," +
-" billtolastname varchar(80) not null," +
-" shiptofirstname varchar(80) not null," +
-" shiptolastname varchar(80) not null," +
-" creditcard varchar(80) not null," +
-" exprdate varchar(7) not null," +
-" cardtype varchar(80) not null," +
-" locale varchar(80) not null" +
- //" ,constraint pk_orders primary key (orderid)" +
+" orderid int not null," +
+" userid varchar(80) not null," +
+" orderdate date not null," +
+" shipaddr1 varchar(80) not null," +
+" shipaddr2 varchar(80) null," +
+" shipcity varchar(80) not null," +
+" shipstate varchar(80) not null," +
+" shipzip varchar(20) not null," +
+" shipcountry varchar(20) not null," +
+" billaddr1 varchar(80) not null," +
+" billaddr2 varchar(80) null," +
+" billcity varchar(80) not null," +
+" billstate varchar(80) not null," +
+" billzip varchar(20) not null," +
+" billcountry varchar(20) not null," +
+" courier varchar(80) not null," +
+" totalprice decimal(10,2) not null," +
+" billtofirstname varchar(80) not null," +
+" billtolastname varchar(80) not null," +
+" shiptofirstname varchar(80) not null," +
+" shiptolastname varchar(80) not null," +
+" creditcard varchar(80) not null," +
+" exprdate varchar(7) not null," +
+" cardtype varchar(80) not null," +
+" locale varchar(80) not null" +
+ //" ,constraint pk_orders primary key (orderid)" +
");" +
"" +
"create table orderstatus (" +
-" orderid int not null," +
-" linenum int not null," +
-" timestamp date not null, " +
-" status varchar(2) not null" +
- //" ,constraint pk_orderstatus primary key (orderid, linenum)" +
+" orderid int not null," +
+" linenum int not null," +
+" timestamp date not null, " +
+" status varchar(2) not null" +
+ //" ,constraint pk_orderstatus primary key (orderid, linenum)" +
");" +
"" +
"create table lineitem (" +
-" orderid int not null," +
-" linenum int not null," +
-" itemid varchar(10) not null," +
-" quantity int not null," +
-" unitprice decimal(10,2) not null" +
- //" ,constraint pk_lineitem primary key (orderid, linenum)" +
+" orderid int not null," +
+" linenum int not null," +
+" itemid varchar(10) not null," +
+" quantity int not null," +
+" unitprice decimal(10,2) not null" +
+ //" ,constraint pk_lineitem primary key (orderid, linenum)" +
");" +
"" +
"create table category (" +
-" catid varchar(10) not null," +
-" name varchar(80) null," +
-" descn varchar(255) null" +
- //", constraint pk_category primary key (catid)" +
+" catid varchar(10) not null," +
+" name varchar(80) null," +
+" descn varchar(255) null" +
+ //", constraint pk_category primary key (catid)" +
");" +
"" +
"create table product (" +
@@ -311,8 +311,8 @@
" name varchar(80) null," +
" descn varchar(255) null" +
//", constraint pk_product primary key (productid)," +
- //" constraint fk_product_1 foreign key (category)" +
- //" references category (catid)" +
+ //" constraint fk_product_1 foreign key (category)" +
+ //" references category (catid)" +
");" +
"" +
"create index productCat on product (category);" +
@@ -331,10 +331,10 @@
" attr4 varchar(80) null," +
" attr5 varchar(80) null" +
//", constraint pk_item primary key (itemid)," +
- //" constraint fk_item_1 foreign key (productid)" +
- //" references product (productid)," +
- //" constraint fk_item_2 foreign key (supplier)" +
- //" references supplier (suppid)" +
+ //" constraint fk_item_1 foreign key (productid)" +
+ //" references product (productid)," +
+ //" constraint fk_item_2 foreign key (supplier)" +
+ //" references supplier (suppid)" +
");" +
"" +
"create index itemProd on item (productid);" +
@@ -347,8 +347,8 @@
"" +
"CREATE TABLE sequence" +
"(" +
-" name varchar(30) not null," +
-" nextid int not null" +
+" name varchar(30) not null," +
+" nextid int not null" +
//" ,constraint pk_sequence primary key (name)" +
");" +
"";
1.3 +57 -57 cocoon-2.1/src/blocks/petstore/samples/flow/petstore.js
Index: petstore.js
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/flow/petstore.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- petstore.js 4 Aug 2003 11:37:08 -0000 1.2
+++ petstore.js 10 Nov 2003 04:12:32 -0000 1.3
@@ -118,9 +118,9 @@
setView();
getPetStore();
cocoon.sendPage("view/index" + EXT, {
- view: VIEW,
- accountForm: accountForm,
- categoryList: categoryList,
+ view: VIEW,
+ accountForm: accountForm,
+ categoryList: categoryList,
});
}
@@ -133,11 +133,11 @@
cartItems.push(cartItem);
}
cocoon.sendPage("view/Cart" + EXT, {
- view: VIEW,
- accountForm: accountForm,
- cartForm: cartForm,
- fmt: fmt,
- cartItems: cartItems
+ view: VIEW,
+ accountForm: accountForm,
+ cartForm: cartForm,
+ fmt: fmt,
+ cartItems: cartItems
});
}
@@ -152,10 +152,10 @@
cartItems.push(cartItem);
}
cocoon.sendPage("view/Cart" + EXT, {
- view: VIEW,
- fmt: fmt,
- accountForm: accountForm,
- cartForm: cartForm, cartItems: cartItems
+ view: VIEW,
+ fmt: fmt,
+ accountForm: accountForm,
+ cartForm: cartForm, cartItems: cartItems
});
}
@@ -169,11 +169,11 @@
cartItems.push(cartItem);
}
cocoon.sendPage("view/Cart" + EXT, {
- view: VIEW,
- fmt: fmt,
- accountForm: accountForm,
- cartForm:cartForm,
- cartItems: cartItems
+ view: VIEW,
+ fmt: fmt,
+ accountForm: accountForm,
+ cartForm:cartForm,
+ cartItems: cartItems
});
}
@@ -187,11 +187,11 @@
cartItems.push(cartItem);
}
cocoon.sendPage("view/Cart" + EXT, {
- view: VIEW,
- fmt: fmt,
- accountForm: accountForm,
- cartForm: cartForm,
- cartItems: cartItems
+ view: VIEW,
+ fmt: fmt,
+ accountForm: accountForm,
+ cartForm: cartForm,
+ cartItems: cartItems
});
}
@@ -204,25 +204,25 @@
var skipResults = 0;
var maxResults = MAX_RESULTS;
while (true) {
- var productList =
+ var productList =
getPetStore().getProductListByCategory(categoryId,
- skipResults,
- maxResults);
+ skipResults,
+ maxResults);
var lastPage = !productList.isLimitedByMaxRows;
var rowCount = productList.rowCount;
cocoon.sendPageAndWait("view/Category" + EXT, {
- accountForm: accountForm,
- productList: productList.rows,
- category: category,
- firstPage: skipResults == 0,
- lastPage: lastPage
+ accountForm: accountForm,
+ productList: productList.rows,
+ category: category,
+ firstPage: skipResults == 0,
+ lastPage: lastPage
});
catch (break) {
print("zapping productList");
productList = null;
}
-
+
catch (continue) {
print("returning from continuation");
print("productList="+productList);
@@ -238,7 +238,7 @@
skipResults += rowCount;
}
}
- }
+ }
}
// Product page
@@ -250,16 +250,16 @@
var maxResults = MAX_RESULTS;
while (true) {
- var itemList =
+ var itemList =
getPetStore().getItemListByProduct(productId,
- skipResults,
+ skipResults,
maxResults);
cocoon.sendPageAndWait("view/Product" + EXT, {
view: VIEW,
- accountForm: accountForm,
+ accountForm: accountForm,
fmt: fmt,
product: product,
- firstPage: skipResults == 0,
+ firstPage: skipResults == 0,
lastPage: !itemList.isLimitedByMaxRows,
itemList: itemList.rows
});
@@ -272,7 +272,7 @@
if (!itemList.isLimitedByMaxRows) {
skipResults += itemList.rowCount;
}
- }
+ }
}
}
@@ -283,11 +283,11 @@
var item = getPetStore().getItem(itemId);
cocoon.sendPage("view/Item" + EXT, {
view: VIEW,
- accountForm: accountForm,
- cartForm: cartForm,
- item: item,
+ accountForm: accountForm,
+ cartForm: cartForm,
+ item: item,
quantity: getPetStore().getItemRowCountByProduct(item.productId),
- product: item.product,
+ product: item.product,
fmt: fmt
});
}
@@ -309,7 +309,7 @@
while (true) {
cocoon.sendPageAndWait("view/SignonForm" + EXT, {
view: VIEW,
- accountForm: accountForm,
+ accountForm: accountForm,
message: message
});
var username = cocoon.request.get("username");
@@ -324,7 +324,7 @@
accountForm.signOn = false;
break;
}
- }
+ }
}
}
@@ -371,8 +371,8 @@
}
function empty(str) {
- return str == null ||
- (str instanceof java.lang.String ?
+ return str == null ||
+ (str instanceof java.lang.String ?
str.length() == 0 :
str.length == 0);
}
@@ -380,12 +380,12 @@
function editAccountForm(form) {
var model = {accountForm: accountForm,
account: accountForm.account,
- categoryList: categoryList,
+ categoryList: categoryList,
username: accountForm.account.userid,
password: "",
password2: ""};
form.setModel(model);
- form.sendView("view/jxforms/EditUserInformation.xml",
+ form.sendView("view/jxforms/EditUserInformation.xml",
function(form) {
if (empty(model.username)) {
form.addViolation("/userName", "User ID is required");
@@ -397,7 +397,7 @@
}
}
});
- form.sendView("view/jxforms/EditAccountInformation.xml",
+ form.sendView("view/jxforms/EditAccountInformation.xml",
function(form) {
if (empty(account.firstName)) {
form.addViolation("/account/firstName", "First name is required");
@@ -415,7 +415,7 @@
}
});
- form.sendView("view/jxforms/EditProfileInformation.xml");
+ form.sendView("view/jxforms/EditProfileInformation.xml");
form.finish();
index();
}
@@ -426,15 +426,15 @@
var keyword = cocoon.request.get("keyword");
if (empty(keyword)) {
cocoon.sendPage("view/Error" + EXT, {
- view: VIEW,
- message: "Please enter a keyword to search for, then press the search button"
+ view: VIEW,
+ message: "Please enter a keyword to search for, then press the search button"
});
return;
}
var skipResults = 0;
var maxResults = 3;
while (true) {
- var result =
+ var result =
getPetStore().searchProductList(keyword, skipResults,
maxResults);
cocoon.sendPageAndWait("view/SearchProducts" + EXT, {
@@ -467,7 +467,7 @@
cocoon.sendPageAndWait("view/Checkout" + EXT, {
view: VIEW,
accountForm: accountForm,
- cartForm: cartForm,
+ cartForm: cartForm,
fmt: fmt,
cartItems: cartItems
});
@@ -479,7 +479,7 @@
var order = orderForm.order;
var valid = false;
while (!valid) {
- cocoon.sendPageAndWait("view/NewOrderForm" + EXT, {
+ cocoon.sendPageAndWait("view/NewOrderForm" + EXT, {
accountForm: accountForm,
view: VIEW,
fmt: fmt,
@@ -496,13 +496,13 @@
cocoon.sendPageAndWait("view/ConfirmOrder" + EXT,
{accountForm: accountForm,
view: VIEW, order: order, fmt: fmt});
-
+
var oldCartForm = cartForm;
cartForm = new CartForm();
cocoon.sendPage("view/ViewOrder" + EXT,
- {view: VIEW, order: order,
+ {view: VIEW, order: order,
accountForm: accountForm,
- itemList: order.lineItems,
+ itemList: order.lineItems,
fmt: fmt});
}