You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/09/27 16:52:12 UTC
svn commit: r1001766 [1/8] - in /ofbiz/branches/jquery: ./
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/content/ applications/content/data/
applications/order/script/org/ofbiz/order/customer/
applications/order/webapp/orderm...
Author: jleroux
Date: Mon Sep 27 14:52:08 2010
New Revision: 1001766
URL: http://svn.apache.org/viewvc?rev=1001766&view=rev
Log:
Merges the trunk at r1001644
This also adds the validate plugin (but its demo) which will be used later for order js migration (WIP see https://issues.apache.org/jira/browse/OFBIZ-3919)
Added:
ofbiz/branches/jquery/applications/content/data/BlogSeedData.xml
- copied unchanged from r1001754, ofbiz/trunk/applications/content/data/BlogSeedData.xml
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/changelog.txt (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.min.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.pack.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/lib/
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/lib/jquery-1.4.2.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/lib/jquery.form.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/lib/jquery.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/lib/jquery.metadata.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ar.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_bg.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_cn.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_cs.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_da.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_de.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_el.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_es.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_fa.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_fi.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_fr.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_he.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_hu.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_it.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_kk.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_lt.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_lv.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_nl.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_no.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_pl.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ptbr.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ptpt.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ro.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ru.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_se.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_sk.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_tr.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_tw.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ua.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_de.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_nl.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/localization/methods_pt.js (with props)
ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/todo
Removed:
ofbiz/branches/jquery/applications/content/data/DemoBlogMiscData.xml
Modified:
ofbiz/branches/jquery/ (props changed)
ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
ofbiz/branches/jquery/applications/content/data/DemoBlogEntryData.xml
ofbiz/branches/jquery/applications/content/ofbiz-component.xml
ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/ConvertUom.js
ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js
ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js
ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/order.js
ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/return.js
ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml
ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy
ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl
ofbiz/branches/jquery/applications/product/widget/facility/FacilityForms.xml
ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml
ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed)
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css
ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CommonScreens.xml
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
Propchange: ofbiz/branches/jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 27 14:52:08 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:951708-1001171
+/ofbiz/trunk:951708-1001754
Modified: ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Mon Sep 27 14:52:08 2010
@@ -2112,7 +2112,7 @@ under the License.
<clear-field field="debitEntry"/>
<make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
<set field="debitEntry.debitCreditFlag" value="D"/>
- <set field="debitEntry.organizationPartyId" from-field="invoice.partyIdFrom"/>
+ <set field="debitEntry.organizationPartyId" from-field="invoice.partyId"/>
<call-class-method method-name="getInvoiceTaxTotalForTaxAuthPartyAndGeo" class-name="org.ofbiz.accounting.invoice.InvoiceWorker"
ret-field="taxAmount">
<field field="invoice" type="GenericValue"/>
@@ -2130,7 +2130,7 @@ under the License.
<clear-field field="debitEntry"/>
<make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
<set field="debitEntry.debitCreditFlag" value="D"/>
- <set field="debitEntry.organizationPartyId" from-field="invoice.partyIdFrom"/>
+ <set field="debitEntry.organizationPartyId" from-field="invoice.partyId"/>
<call-class-method method-name="getInvoiceUnattributedTaxTotal" class-name="org.ofbiz.accounting.invoice.InvoiceWorker"
ret-field="taxAmount">
<field field="invoice" type="GenericValue"/>
Modified: ofbiz/branches/jquery/applications/content/data/DemoBlogEntryData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/data/DemoBlogEntryData.xml?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/data/DemoBlogEntryData.xml (original)
+++ ofbiz/branches/jquery/applications/content/data/DemoBlogEntryData.xml Mon Sep 27 14:52:08 2010
@@ -18,9 +18,9 @@
under the License.
-->
<entity-engine-xml>
- <DataResource dataResourceId="BLG10000" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" dataResourceName="Float left" mimeTypeId="text/html" objectInfo="component://ecommerce/widget/blog/BlogTemplates.xml#FloatLeft" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2007-01-23 16:46:38.468" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:38.468" lastUpdatedTxStamp="2007-01-23 16:46:37.359" createdStamp="2007-01-23 16:46:22.421" createdTxStamp="2007-01-23 16:46:21.406"/>
- <DataResource dataResourceId="BLG10001" dataResourceTypeId="OFBIZ_FILE_BIN" dataTemplateTypeId="NONE" statusId="CTNT_INITIAL_DRAFT" mimeTypeId="image/jpeg" objectInfo="specialpurpose/ecommerce/data/cutekid.jpg" isPublic="Y" createdDate="2007-01-23 16:46:22.843" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:22.843" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:22.843" lastUpdatedTxStamp="2007-01-23 16:46:21.406" createdStamp="2007-01-23 16:46:22.843" createdTxStamp="2007-01-23 16:46:21.406"/>
- <DataResource dataResourceId="BLG10002" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_INITIAL_DRAFT" createdDate="2007-01-23 16:46:22.984" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:38.671" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:38.671" lastUpdatedTxStamp="2007-01-23 16:46:37.359" createdStamp="2007-01-23 16:46:22.984" createdTxStamp="2007-01-23 16:46:21.406"/>
+ <DataResource dataResourceId="BLG10000" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" isPublic="Y" createdByUserLogin="admin" createdDate="2004-01-16 01:24:06.522" createdStamp="2007-01-23 16:46:22.421" createdTxStamp="2007-01-23 16:46:21.406" lastModifiedByUserLogin="admin" lastModifiedDate="2010-09-26 13:13:32.482" lastUpdatedStamp="2010-09-26 13:13:32.483" lastUpdatedTxStamp="2010-09-26 13:13:32.429" mimeTypeId="application/octet-stream" statusId="CTNT_PUBLISHED"/>
+ <DataResource dataResourceId="BLG10001" dataResourceTypeId="OFBIZ_FILE_BIN" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" mimeTypeId="image/jpeg" objectInfo="specialpurpose/ecommerce/data/cutekid.jpg" isPublic="Y" createdDate="2007-01-23 16:46:22.843" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:22.843" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:22.843" lastUpdatedTxStamp="2007-01-23 16:46:21.406" createdStamp="2007-01-23 16:46:22.843" createdTxStamp="2007-01-23 16:46:21.406"/>
+ <DataResource dataResourceId="BLG10002" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2007-01-23 16:46:22.984" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:38.671" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:38.671" lastUpdatedTxStamp="2007-01-23 16:46:37.359" createdStamp="2007-01-23 16:46:22.984" createdTxStamp="2007-01-23 16:46:21.406"/>
<DataResource dataResourceId="BLG10003" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2007-01-23 16:47:49.343" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:47:49.343" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:47:49.343" lastUpdatedTxStamp="2007-01-23 16:47:49.328" createdStamp="2007-01-23 16:47:49.343" createdTxStamp="2007-01-23 16:47:49.328"/>
<DataResource dataResourceId="BLG10004" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2007-01-23 16:50:38.171" createdByUserLogin="blog_guest" lastModifiedDate="2007-01-23 16:50:38.171" lastModifiedByUserLogin="blog_guest" lastUpdatedStamp="2007-01-23 16:50:38.187" lastUpdatedTxStamp="2007-01-23 16:50:38.171" createdStamp="2007-01-23 16:50:38.187" createdTxStamp="2007-01-23 16:50:38.171"/>
<DataResource dataResourceId="BLG10005" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2007-01-23 16:52:11.421" createdByUserLogin="blog_guest" lastModifiedDate="2007-01-23 16:52:11.421" lastModifiedByUserLogin="blog_guest" lastUpdatedStamp="2007-01-23 16:52:11.421" lastUpdatedTxStamp="2007-01-23 16:52:11.406" createdStamp="2007-01-23 16:52:11.421" createdTxStamp="2007-01-23 16:52:11.406"/>
@@ -31,8 +31,8 @@
<DataResource dataResourceId="BLG10010" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2007-01-23 17:07:12.625" createdByUserLogin="madmax" lastModifiedDate="2007-01-23 17:07:12.625" lastModifiedByUserLogin="madmax" lastUpdatedStamp="2007-01-23 17:07:12.671" lastUpdatedTxStamp="2007-01-23 17:07:12.234" createdStamp="2007-01-23 17:07:12.671" createdTxStamp="2007-01-23 17:07:12.234"/>
<Content contentId="BLG10000" contentTypeId="DOCUMENT" ownerContentId="BLOGROOTBIGAL" dataResourceId="BLOG_TPL_TOPLEFT" statusId="CTNT_PUBLISHED" contentName="Cute Kid " description="Cutest Kid in the World" childBranchCount="1" createdDate="2007-01-23 16:46:21.453" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:37.453" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:52:23.14" lastUpdatedTxStamp="2007-01-23 16:52:22.546" createdStamp="2007-01-23 16:46:21.593" createdTxStamp="2007-01-23 16:46:21.406"/>
<Content contentId="BLG10001" contentTypeId="DOCUMENT" ownerContentId="BLOGROOTBIGAL" dataResourceId="BLG10000" statusId="CTNT_PUBLISHED" contentName="Cute Kid " description="Cutest Kid in the World" createdDate="2007-01-23 16:46:21.453" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:38.562" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:38.579" lastUpdatedTxStamp="2007-01-23 16:46:37.359" createdStamp="2007-01-23 16:46:22.765" createdTxStamp="2007-01-23 16:46:21.406"/>
- <Content contentId="BLG10002" contentTypeId="DOCUMENT" ownerContentId="BLOGROOTBIGAL" dataResourceId="BLG10001" statusId="CTNT_INITIAL_DRAFT" contentName="Cute Kid " description="Cutest Kid in the World" createdDate="2007-01-23 16:46:22.906" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:22.906" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:22.921" lastUpdatedTxStamp="2007-01-23 16:46:21.406" createdStamp="2007-01-23 16:46:22.921" createdTxStamp="2007-01-23 16:46:21.406"/>
- <Content contentId="BLG10003" contentTypeId="DOCUMENT" ownerContentId="BLOGROOTBIGAL" dataResourceId="BLG10002" statusId="CTNT_INITIAL_DRAFT" createdDate="2007-01-23 16:46:23.031" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:23.031" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:23.046" lastUpdatedTxStamp="2007-01-23 16:46:21.406" createdStamp="2007-01-23 16:46:23.046" createdTxStamp="2007-01-23 16:46:21.406"/>
+ <Content contentId="BLG10002" contentTypeId="DOCUMENT" ownerContentId="BLOGROOTBIGAL" dataResourceId="BLG10001" statusId="CTNT_PUBLISHED" contentName="Cute Kid " description="Cutest Kid in the World" createdDate="2007-01-23 16:46:22.906" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:22.906" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:22.921" lastUpdatedTxStamp="2007-01-23 16:46:21.406" createdStamp="2007-01-23 16:46:22.921" createdTxStamp="2007-01-23 16:46:21.406"/>
+ <Content contentId="BLG10003" contentTypeId="DOCUMENT" ownerContentId="BLOGROOTBIGAL" dataResourceId="BLG10002" statusId="CTNT_PUBLISHED" contentName="Cute Kid " description="Cutest Kid in the World" createdDate="2007-01-23 16:46:23.031" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:23.031" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:23.046" lastUpdatedTxStamp="2007-01-23 16:46:21.406" createdStamp="2007-01-23 16:46:23.046" createdTxStamp="2007-01-23 16:46:21.406"/>
<Content contentId="BLG10004" contentTypeId="DOCUMENT" ownerContentId="BLG10000" dataResourceId="BLG10003" statusId="CTNT_PUBLISHED" contentName="RE:Cute Kid " description="You got that right." childBranchCount="1" createdDate="2007-01-23 16:47:49.375" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:47:49.375" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:52:23.187" lastUpdatedTxStamp="2007-01-23 16:52:22.546" createdStamp="2007-01-23 16:47:49.375" createdTxStamp="2007-01-23 16:47:49.328"/>
<Content contentId="BLG10005" contentTypeId="DOCUMENT" ownerContentId="BLG10000" dataResourceId="BLG10004" statusId="CTNT_PUBLISHED" contentName="Chopped liver?" description="What am I - chopped liver?" childBranchCount="1" createdDate="2007-01-23 16:50:38.296" createdByUserLogin="blog_guest" lastModifiedDate="2007-01-23 16:50:38.296" lastModifiedByUserLogin="blog_guest" lastUpdatedStamp="2007-01-23 16:52:23.203" lastUpdatedTxStamp="2007-01-23 16:52:22.546" createdStamp="2007-01-23 16:50:38.343" createdTxStamp="2007-01-23 16:50:38.171"/>
<Content contentId="BLG10006" contentTypeId="DOCUMENT" ownerContentId="BLG10000" dataResourceId="BLG10005" statusId="CTNT_PUBLISHED" contentName="Chopped liver?" description="Look like your father" childBranchCount="0" createdDate="2007-01-23 16:52:11.437" createdByUserLogin="blog_guest" lastModifiedDate="2007-01-23 16:52:11.437" lastModifiedByUserLogin="blog_guest" lastUpdatedStamp="2007-01-23 16:52:23.204" lastUpdatedTxStamp="2007-01-23 16:52:22.546" createdStamp="2007-01-23 16:52:11.453" createdTxStamp="2007-01-23 16:52:11.406"/>
Modified: ofbiz/branches/jquery/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/ofbiz-component.xml?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/ofbiz-component.xml (original)
+++ ofbiz/branches/jquery/applications/content/ofbiz-component.xml Mon Sep 27 14:52:08 2010
@@ -46,11 +46,11 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/BlogSeedData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogPubPtData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogUsersData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogMiscData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogEntryData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/WebSitePublishPointData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/CompDocData.xml"/>
Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 27 14:52:08 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
-/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1001171
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1001754
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Mon Sep 27 14:52:08 2010
@@ -138,23 +138,23 @@ ${virtualJavaScript?if_exists}
<script language="JavaScript" type="text/javascript">
<!--
-document.observe('dom:loaded', function() {
- Event.observe($('configFormId'),'change',getConfigDetails);
+jQuery(document).ready( function() {
+ jQuery('#configFormId').change(getConfigDetails);
});
-function getConfigDetails(event) {
- var element = Event.element(event);
- if (element.identify().startsWith('comments_')) {
+function getConfigDetails() {
+ var element = jQuery(this);
+ if (element.attr("id").is("[id^='comments_']")) {
// don't update the price for comment change
return;
}
- new Ajax.Request('/ordermgr/control/getConfigDetailsEvent',{parameters: $('configFormId').serialize(), requestHeaders: {Accept: 'application/json'},
-
- onSuccess: function(transport){
- var data = transport.responseText.evalJSON(true);
-
- if (data._ERROR_MESSAGE_LIST_ != undefined) {
+ jQuery.ajax({
+ url: '/ordermgr/control/getConfigDetailsEvent',
+ data: jQuery('configFormId').serialize(),
+ type: "POST",
+ success: function(data) {
+ if (data._ERROR_MESSAGE_LIST_ != undefined) {
//console.log(data._ERROR_MESSAGE_LIST_);
//alert(data._ERROR_MESSAGE_LIST_);
}else if (data._ERROR_MESSAGE_ != undefined) {
@@ -167,15 +167,12 @@ function getConfigDetails(event) {
var configId = data.configId;
document.getElementById('totalPrice').innerHTML = totalPrice;
document.addToShoppingList.configId.value = configId;
- event.stop();
}
- },
+ },
+ error: function(data) {
- onFailure: function(transport) {
- var data = transport.responseText.evalJSON(true);
- //console.log('Failure');
}
- });
+ });
}
-->
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/ConvertUom.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/ConvertUom.js?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/ConvertUom.js (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/ConvertUom.js Mon Sep 27 14:52:08 2010
@@ -18,17 +18,19 @@
*/
function getConvertedPrice(element, uomId, uomIdTo, rowCount, orderCurrencyUnitPrice, unitCost) {
- var request = $F('getConvertedPrice');
- new Ajax.Request(request, {
- asynchronous: false,
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
- if (data.convertedValue && confirm($('alertMessage').value)) {
- $('unitCost_'+rowCount).value = data.convertedValue;
+ var request = jQuery('#getConvertedPrice').val();
+ jQuery.ajax({
+ url: request,
+ data: { uomId : uomId, uomIdTo : uomIdTo, originalValue : element.value }
+ async: true,
+ type: "POST",
+ success: function(data){
+ if (data.convertedValue && confirm(jQuery('#alertMessage').val())) {
+ jQuery('#unitCost_'+rowCount).val(data.convertedValue);
} else {
- $('orderCurrencyUnitPrice_'+rowCount).value = orderCurrencyUnitPrice;
- $('unitCost_'+rowCount).value = unitCost;
+ jQuery('#orderCurrencyUnitPrice_'+rowCount).val(orderCurrencyUnitPrice);
+ jQuery('#unitCost_'+rowCount).val(unitCost);
}
- }, parameters: { uomId : uomId, uomIdTo : uomIdTo, originalValue : element.value }
+ }
});
}
\ No newline at end of file
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js Mon Sep 27 14:52:08 2010
@@ -16,22 +16,16 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
*/
-
var validateNewShippingAdd = null;
-document.observe('dom:loaded', function() {
- if ($('addShippingAddress')) {
- validateNewShippingAdd = new Validation('addShippingAddress', {immediate: true, onSubmit: false});
- Event.observe($('countryGeoId'), 'change', function() {
- getAssociatedStateList('countryGeoId', 'stateProvinceGeoId', 'advice-required-stateProvinceGeoId', 'states');
+jQuery(document).ready( function() {
+
+ var addShippingAddress = jQuery('#addShippingAddress');
+ if (addShippingAddress.length > 0) {
+ // add the form validator
+ addShippingAddress.validate();
+
+ jQuery('#country').change( function() {
+ getAssociatedStateList('country', 'state', 'advice-required-stateProvinceGeoId', 'states');
});
- getAssociatedStateList('countryGeoId', 'stateProvinceGeoId', 'advice-required-stateProvinceGeoId', 'states');
- }
- if ($('submitAddShippingAddress')) {
- Event.observe($('submitAddShippingAddress'), 'click', submitValidNewShippingAddressForm);
- }
-})
-function submitValidNewShippingAddressForm() {
- if (validateNewShippingAdd.validate()) {
- $('addShippingAddress').submit();
}
-}
+});
\ No newline at end of file
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js Mon Sep 27 14:52:08 2010
@@ -17,109 +17,102 @@
* under the License.
*/
-document.observe('dom:loaded', function() {
- // Autocompleter for shipping panel
- // Preventing getCountryList() from calling and not removed all autocompleter functions so that we can reuse in future.
- //getCountryList();
-});
-
function getCountryList() {
- countryTargetField = $('shipToCountryGeo');
- countryDivToPopulate = $('shipToCountries');
- countryHiddenTarget = $('shipToCountryGeoId');
- new Ajax.Request("getCountryList", {
- asynchronous: false,
- onSuccess: callCountryAutocompleter
+ countryTargetField = jQuery('#shipToCountryGeo');
+ countryDivToPopulate = jQuery('#shipToCountries');
+ countryHiddenTarget = jQuery('#shipToCountryGeoId');
+ jQuery.ajax({
+ url: "getCountryList",
+ type: "POST",
+ async: false,
+ success: callCountryAutocompleter
});
}
-function callCountryAutocompleter(transport) {
- var geos = new Hash();
- var data = transport.responseText.evalJSON(true);
+function callCountryAutocompleter(data) {
countryList = data.countryList;
- countryList.each(function(country) {
- var countryName = country.split(': ');
- geos.set(countryName[1], countryName[0]);
- });
- new Autocompleter.Local(countryTargetField, countryDivToPopulate, $H(geos), { partialSearch: false, afterUpdateElement: setKeyAsParameterAndGetStateList});
+ countryTargetField.autcomplete({source: countryList, select: setKeyAsParameterAndGetStateList});
}
-function setKeyAsParameterAndGetStateList(text, li) {
- countryHiddenTarget.value = li.id;
+function setKeyAsParameterAndGetStateList(event, ui) {
+ countryHiddenTarget.value = ui.item;
getAssociatedStateListForAutoComplete();
}
function getAssociatedStateListForAutoComplete() {
- stateTargetField = $('shipToStateProvinceGeo');
- stateDivToPopulate = $('shipToStates');
- stateHiddenTarget = $('shipToStateProvinceGeoId');
- new Ajax.Request("getAssociatedStateList", {
- asynchronous: false,
- parameters: $('shippingForm').serialize(),
- onSuccess: callStateAutocompleter
+ stateTargetField = jQuery('#shipToStateProvinceGeo');
+ stateDivToPopulate = jQuery('#shipToStates');
+ stateHiddenTarget = jQuery('#shipToStateProvinceGeoId');
+ jQuery.ajax({
+ url: "getAssociatedStateList",
+ type: "POST",
+ data: jQuery('#shippingForm').serialize(),
+ async: false,
+ success: function(data) {callStateAutocompleter(data); }
});
}
-function callStateAutocompleter(transport) {
- var geos = new Hash();
- var data = transport.responseText.evalJSON(true);
+function callStateAutocompleter(data){
stateList = data.stateList;
- stateList.each(function(state) {
- var stateName = state.split(': ');
- geos.set(stateName[1], stateName[0]);
- });
if (stateList.size() <= 1) {
- $('shipToStateProvinceGeo').value = "No States/Provinces exists";
- $('shipToStateProvinceGeoId').value = "_NA_";
- Effect.Fade('shipStates', {duration: 0.0});
- Effect.Fade('advice-required-shipToStateProvinceGeo', {duration: 0.0});
- Event.stopObserving($('shipToStateProvinceGeo'), 'blur');
+ jQuery('#shipToStateProvinceGeo').value = "No States/Provinces exists";
+ jQuery('#shipToStateProvinceGeoId').value = "_NA_";
+ jQuery("#shipStates").fadeOut("fast");
+ jQuery("#advice-required-shipToStateProvinceGeo").fadeOut("fast");
+ jQuery("#shipToStateProvinceGeo").unbind("blur");
} else {
- $('shipToStateProvinceGeo').value = "";
- $('shipToStateProvinceGeoId').value = "";
- Effect.Appear('shipStates', {duration: 0.0});
- Event.observe($('shipToStateProvinceGeo'), 'blur', function() {
- if ($('shipToStateProvinceGeo').value == "") {
- Effect.Appear('advice-required-shipToStateProvinceGeo', {duration: 0.0});
+ jQuery('#shipToStateProvinceGeo').value = "";
+ jQuery('#shipToStateProvinceGeoId').value = "";
+ jQuery("#shipStates").fadeIn("fast");
+ jQuery("#shipToStateProvinceGeo").bind("blur", function() {
+ if (jQuery('#shipToStateProvinceGeo').val() == "") {
+ jQuery("#advice-required-shipToStateProvinceGeo").fadeIn("fast");
}
});
}
- new Autocompleter.Local(stateTargetField, stateDivToPopulate, $H(geos), { partialSearch: false, afterUpdateElement: setKeyAsParameter });
+ stateTargetField.autocomplete({source: stateList, select: setKeyAsParameter});
}
-function setKeyAsParameter(text, li) {
- stateHiddenTarget.value = li.id;
+function setKeyAsParameter(event, ui) {
+ stateHiddenTarget.value = ui.item;
}
//Generic function for fetching country's associated state list.
function getAssociatedStateList(countryId, stateId, errorId, divId) {
- var optionList = [];
+ var countryGeoId = jQuery("#" + countryId).val();
var requestToSend = "getAssociatedStateList";
- if ($('orderViewed')) {
+ if (jQuery('#orderViewed')) {
requestToSend = "/ordermgr/control/getAssociatedStateList"
}
- new Ajax.Request(requestToSend, {
- asynchronous: false,
- parameters: {countryGeoId:$F(countryId)},
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
+ jQuery.ajax({
+ url: requestToSend,
+ sync: false,
+ type: "POST",
+ data: {countryGeoId: countryGeoId},
+ success: function(data) {
+ if (data._ERROR_MESSAGE_ ) {
+ // no data found/ error occured
+ return;
+ }
stateList = data.stateList;
- stateList.each(function(state) {
- geoValues = state.split(': ');
- optionList.push("<option value = "+geoValues[1]+" >"+geoValues[0]+"</option>");
+ var stateSelect = jQuery("#" + stateId);
+ stateSelect.find("option").remove();
+ jQuery.each(stateList, function(state) {
+ geoValues = this.split(': ');
+ stateSelect.append(jQuery('<option value = '+geoValues[1]+' >'+geoValues[0]+'</option>'));
});
- $(stateId).update(optionList);
- if (stateList.size() <= 1) {
- if ($(divId).visible() || $(errorId).visible()) {
- Effect.Fade(divId, {duration: 0.0});
- Effect.Fade(errorId, {duration: 0.0});
- Event.stopObserving(stateId, 'blur');
+
+ if (stateList.length <= 1) {
+ if (jQuery("#" + divId).is(':visible') || jQuery("#" + errorId).is(':visible')) {
+ jQuery("#divId").fadeOut("fast");
+ jQuery("#errorId").fadeOut("fast");
+ jQuery("#stateId").unbind("blur");
}
} else {
- Effect.Appear(divId, {duration: 0.0});
- Event.observe(stateId, 'blur', function() {
- if ($F(stateId) == "") {
- Effect.Appear(errorId, {duration: 0.0});
+ jQuery("#divId").fadeIn("fast");
+ jQuery("#stateId").bind("blur", function() {
+ if (jQuery("#" + stateId).val() == "") {
+ jQuery("#errorId").fadeIn("fast")
}
});
}
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/order.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/order.js?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/order.js (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/order.js Mon Sep 27 14:52:08 2010
@@ -18,10 +18,13 @@ under the License.
*/
function markOrderViewed() {
- new Ajax.Request('markOrderViewed',{parameters: $('orderViewed').serialize(), requestHeaders: {Accept: 'application/json'},
- onSuccess: function() {
- Effect.Fade('isViewed', {duration: 0.0});
- Effect.Appear('viewed', {duration: 0.3});
+ jQuery.ajax({
+ url: 'markOrderViewed',
+ type: "POST",
+ data: jQuery('#orderViewed').serialize(),
+ succes: function(data) {
+ jQuery("#isViewed").fadeOut('fast');
+ jQuery("#viewed").fadeIn('fast');
}
});
}
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/return.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/return.js?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/return.js (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/return.js Mon Sep 27 14:52:08 2010
@@ -17,23 +17,26 @@ specific language governing permissions
under the License.
*/
-document.observe('dom:loaded', function() {
- Event.observe($('returnHeaderTypeId'), 'change', function() {
+jQuery(document).ready( function() {
+ jQuery('#returnHeaderTypeId').change( function() {
changeStatusCorrespondingToHeaderType();
});
});
function changeStatusCorrespondingToHeaderType() {
var listOptions = [];
- new Ajax.Request('/ordermgr/control/getStatusItemsForReturn', {
- asynchronous: false,
- onSuccess: function(transport) {
- var data = transport.responseText.evalJSON(true);
+ jQuery.ajax({
+ url: '/ordermgr/control/getStatusItemsForReturn',
+ async: false,
+ type: 'POST',
+ data: {returnHeaderTypeId: jQuery('#returnHeaderTypeId').val()},
+ success: function (data) {
var statusItems = data.statusItems;
+ var status = jQuery('#statusId');
+ status.find("option").remove();
statusItems.each( function(statusItem) {
- listOptions.push("<option value = " + statusItem.statusId + " > " + statusItem.description + " </option>");
+ status.append(jQuery("<option value = " + statusItem.statusId + " > " + statusItem.description + " </option>"));
});
- $('statusId').update(listOptions);
- }, parameters: {returnHeaderTypeId: $F('returnHeaderTypeId')}, requestHeaders: {Accept: 'application/json'}
+ }
});
}
\ No newline at end of file
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl Mon Sep 27 14:52:08 2010
@@ -60,7 +60,7 @@ function toggleOrderIdList() {
if (element.name == "orderIdList" && !element.checked)
isAllSelected = false;
}
- $('checkAllOrders').checked = isAllSelected;
+ jQuery('#checkAllOrders').attr("checked", isAllSelected);
}
// -->
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Mon Sep 27 14:52:08 2010
@@ -19,29 +19,29 @@ under the License.
<script language="JavaScript" type="text/javascript">
function editInstruction() {
- $('shippingInstructions').style.display="block";
- $('saveInstruction').style.display="inline";
- $('editInstruction').style.display="none";
- $('instruction').style.display="none";
+ jQuery('#shippingInstructions').css({display:'block'});
+ jQuery('#saveInstruction').css({display:'inline'});
+ jQuery('#editInstruction').css({display:'none'});
+ jQuery('#instruction').css({display:'none'});
}
function addInstruction() {
- $('shippingInstructions').style.display="block";
- $('saveInstruction').style.display="inline";
- $('addInstruction').style.display="none";
+ jQuery('#shippingInstructions').css({display:'block'});
+ jQuery('#saveInstruction').css({display:'inline'});
+ jQuery('#addInstruction').css({display:'none'});
}
function saveInstruction() {
document.updateShippingInstructionsForm.submit();
}
function editGiftMessage() {
- $('giftMessage').style.display="block";
- $('saveGiftMessage').style.display="inline";
- $('editGiftMessage').style.display="none";
- $('message').style.display="none";
+ jQuery('#giftMessage').css({display:'block'});
+ jQuery('#saveGiftMessage').css({display:'inline'});
+ jQuery('#editGiftMessage').css({display:'none'});
+ jQuery('#message').css({display:'none'});
}
function addGiftMessage() {
- $('giftMessage').style.display="block";
- $('saveGiftMessage').style.display="inline";
- $('addGiftMessage').style.display="none";
+ jQuery('#giftMessage').css({display:'block'});
+ jQuery('#saveGiftMessage').css({display:'inline'});
+ jQuery('#addGiftMessage').css({display:'none'});
}
function saveGiftMessage() {
document.setGiftMessageForm.submit();
@@ -280,6 +280,9 @@ under the License.
<td valign="top" width="80%">
<input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
<a class="buttontext" id="newShippingAddress" href="javascript:void(0);">${uiLabelMap.OrderNewShippingAddress}</a>
+ <script type="text/javascript">
+ jQuery("#newShippingAddress").click(function(){jQuery("#newShippingAddressForm").dialog("open")});
+ </script>
</td>
</tr>
</#if>
@@ -312,7 +315,7 @@ under the License.
</div>
<div class="form-row">
<label for="postalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-postalCode" style="display: none" class="custom-advice">(required)</span></label>
- <div class="form-field"><input type="text" class="required" name="shipToPostalCode" id="postalCode" value="" size="30" maxlength="10" /></div>
+ <div class="form-field"><input type="text" class="required number" name="shipToPostalCode" id="postalCode" value="" size="30" maxlength="10" /></div>
</div>
<div class="form-row">
<label for="countryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label>
@@ -338,16 +341,27 @@ under the License.
</div>
</div>
<div class="form-row">
- <input id="submitAddShippingAddress" type="button" value="${uiLabelMap.CommonSubmit}"/>
+ <input id="submitAddShippingAddress" type="button" value="${uiLabelMap.CommonSubmit}" style="display:none"/>
<form action="">
- <input class="popup_closebox buttontext" type="button" value="${uiLabelMap.CommonClose}"/>
+ <input class="popup_closebox buttontext" type="button" value="${uiLabelMap.CommonClose}" style="display:none"/>
</form>
</div>
</form>
</div>
<script language="JavaScript" type="text/javascript">
- document.observe('dom:loaded', function() {
- new Popup('newShippingAddressForm', 'newShippingAddress', {modal: true, position: 'center', trigger: 'click'})
+ jQuery(document).ready( function() {
+ jQuery("#newShippingAddressForm").dialog({autoOpen: false, modal: true,
+ buttons: {
+ '${uiLabelMap.CommonSubmit}': function() {
+ var addShippingAddress = jQuery("#addShippingAddress");
+ jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(addShippingAddress);
+ addShippingAddress.submit();
+ },
+ '${uiLabelMap.CommonClose}': function() {
+ jQuery(this).dialog('close');
+ }
+ }
+ });
});
</script>
<table width="100%" border="0" cellpadding="1" cellspacing="0">
@@ -364,13 +378,13 @@ under the License.
</td>
</tr>
</#if>
-
+
<#-- This section appears when Shipment of order is in picked status and its items are packed,this case comes when new shipping estimates based on weight of packages are more than or less than default percentage (defined in shipment.properties) of original shipping estimate-->
<#-- getShipGroupEstimate method of ShippingEvents class can be used for get shipping estimate from system, on the basis of new package's weight -->
<#if shippingRateList?has_content>
<#if orderReadHelper.getOrderTypeId() != "PURCHASE_ORDER">
<tr><td colspan="3"><hr /></td></tr>
- <tr>
+ <tr>
<td colspan="3">
<table>
<tr>
@@ -388,7 +402,7 @@ under the License.
<#if (shippingRate.rate > -1)>
<@ofbizCurrency amount=shippingRate.rate isoCode=orderReadHelper.getCurrency()/>
<#else>
- ${uiLabelMap.OrderCalculatedOffline}
+ ${uiLabelMap.OrderCalculatedOffline}
</#if>
</td>
</tr>
@@ -486,7 +500,7 @@ under the License.
<td id="instruction">
<label>${shipGroup.shippingInstructions}</label>
</td>
- <td>
+ <td>
<a href="javascript:editInstruction();" class="buttontext" id="editInstruction">${uiLabelMap.CommonEdit}</a>
</td>
</tr>
@@ -541,9 +555,9 @@ under the License.
<form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
<input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
- <@htmlTemplate.renderDateTimeField name="shipAfterDate" value="${shipGroup.shipAfterDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate" event="" action="" value="${shipGroup.shipAfterDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<br/>
- <@htmlTemplate.renderDateTimeField name="shipByDate" value="${shipGroup.shipByDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipByDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="shipByDate" event="" action="" value="${shipGroup.shipByDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipByDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonUpdate}"/>
</form>
</td>
Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml Mon Sep 27 14:52:08 2010
@@ -53,9 +53,6 @@ under the License.
<actions>
<set field="titleProperty" value="OrderViewOrder"/>
<set field="headerItem" value="findorders"/>
- <set field="layoutSettings.styleSheets[+0]" value="/images/prototypejs/popup.css" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/validation.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/order.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/OrderShippingInfo.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
@@ -501,9 +498,9 @@ under the License.
<include-form name="ListCustomerOrders" location="component://order/widget/ordermgr/OrderForms.xml"/>
</screenlet>
</widgets>
- </section>
+ </section>
</screen>
-
+
<screen name="ListSalesOrders">
<section>
<actions>
@@ -551,6 +548,6 @@ under the License.
</fail-widgets>
</section>
</widgets>
- </section>
+ </section>
</screen>
</screens>
Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 27 14:52:08 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456
/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1001171
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1001754
Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 27 14:52:08 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
-/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1001171
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1001754
Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Mon Sep 27 14:52:08 2010
@@ -133,6 +133,18 @@ under the License.
<clear-field field="serviceInMap"/>
<clear-field field="currentInventoryItemId"/>
+ <!-- Set supplier partyId, if inventory received by purchase order -->
+ <if-not-empty field="parameters.orderId">
+ <entity-and entity-name="OrderRole" list="orderRoles">
+ <field-map field-name="orderId" from-field="parameters.orderId"/>
+ <field-map field-name="roleTypeId" value="SUPPLIER_AGENT"/>
+ </entity-and>
+ <if-not-empty field="orderRoles">
+ <first-from-list list="orderRoles" entry="orderRole"/>
+ <set field="parameters.partyId" from-field="orderRole.partyId"/>
+ </if-not-empty>
+ </if-not-empty>
+
<if-empty field="parameters.currentInventoryItemId">
<set-service-fields service-name="createInventoryItem" map="parameters" to-map="serviceInMap"/>
<call-service service-name="createInventoryItem" in-map-name="serviceInMap">
Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original)
+++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Mon Sep 27 14:52:08 2010
@@ -288,8 +288,18 @@ public class ShipmentServices {
return ServiceUtil.returnError("Cannot get shipping address entity");
}
} else if (shippingPostalCode != null) {
+ String countryGeoId = null;
+ try {
+ EntityCondition cond =EntityCondition.makeCondition(UtilMisc.toMap("geoTypeId", "COUNTRY", "geoCode", shippingCountryCode));
+ GenericValue countryGeo = EntityUtil.getFirst(delegator.findList("Geo", cond, null, null, null, true));
+ if (countryGeo != null) {
+ countryGeoId = countryGeo.getString("geoId");
+ }
+ } catch (GenericEntityException e) {
+ Debug.logError(e, module);
+ }
shipAddress = delegator.makeValue("PostalAddress");
- shipAddress.set("countryGeoId", shippingCountryCode);
+ shipAddress.set("countryGeoId", countryGeoId);
shipAddress.set("postalCodeGeoId", shippingPostalCode);
}
// Get the possible estimates.
Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy (original)
+++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy Mon Sep 27 14:52:08 2010
@@ -17,6 +17,7 @@
* under the License.
*/
+import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.entity.util.*
import org.ofbiz.entity.condition.*
import org.ofbiz.service.ServiceUtil
@@ -58,6 +59,7 @@ if (purchaseOrderId) {
product = null;
if (productId) {
product = delegator.findOne("Product", [productId : productId], false);
+ context.supplierPartyIds = EntityUtil.getFieldListFromEntityList(EntityUtil.filterByDate(delegator.findList("SupplierProduct", EntityCondition.makeCondition([productId : productId]), null, ["partyId"], null, false), nowTimestamp, "availableFromDate", "availableThruDate", true), "partyId", true);
}
shipments = null;
Modified: ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl Mon Sep 27 14:52:08 2010
@@ -159,6 +159,23 @@ under the License.
</tr>
<tr>
<td width="14%"> </td>
+ <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductSupplier}</td>
+ <td width="6%"> </td>
+ <td width="74%">
+ <select name="partyId">
+ <option value=""></option>
+ <#if supplierPartyIds?has_content>
+ <#list supplierPartyIds as supplierPartyId>
+ <option value="${supplierPartyId}" <#if supplierPartyId == parameters.partyId?if_exists> selected="selected"</#if>>
+ [${supplierPartyId}] ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, supplierPartyId, true)}
+ </option>
+ </#list>
+ </#if>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td width="14%"> </td>
<td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductDateReceived}</td>
<td width="6%"> </td>
<td width="74%">
Modified: ofbiz/branches/jquery/applications/product/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/FacilityForms.xml?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/facility/FacilityForms.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/facility/FacilityForms.xml Mon Sep 27 14:52:08 2010
@@ -123,6 +123,7 @@ under the License.
</hyperlink>
</field>
<field name="internalName"><display/></field>
+ <field name="partyId"><display/></field>
<field name="locationSeqId" widget-style="buttontext">
<hyperlink target="EditFacilityLocation" description="${areaId}:${aisleId}:${sectionId}:${levelId}:${positionId} [${locationSeqId}]">
<parameter param-name="facilityId"/>
Modified: ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml?rev=1001766&r1=1001765&r2=1001766&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml Mon Sep 27 14:52:08 2010
@@ -119,6 +119,7 @@ under the License.
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.2.custom.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.5.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
<set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
@@ -337,6 +338,7 @@ under the License.
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.5.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
<set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-${initialLocale}.js" global="true"/>
Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 27 14:52:08 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
-/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1001171
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1001754
Added: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js?rev=1001766&view=auto
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js (added)
+++ ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js Mon Sep 27 14:52:08 2010
@@ -0,0 +1,259 @@
+(function() {
+
+ function stripHtml(value) {
+ // remove html tags and space chars
+ return value.replace(/<.[^<>]*?>/g, ' ').replace(/ | /gi, ' ')
+ // remove numbers and punctuation
+ .replace(/[0-9.(),;:!?%#$'"_+=\/-]*/g,'');
+ }
+ jQuery.validator.addMethod("maxWords", function(value, element, params) {
+ return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length < params;
+ }, jQuery.validator.format("Please enter {0} words or less."));
+
+ jQuery.validator.addMethod("minWords", function(value, element, params) {
+ return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params;
+ }, jQuery.validator.format("Please enter at least {0} words."));
+
+ jQuery.validator.addMethod("rangeWords", function(value, element, params) {
+ return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params[0] && value.match(/bw+b/g).length < params[1];
+ }, jQuery.validator.format("Please enter between {0} and {1} words."));
+
+})();
+
+jQuery.validator.addMethod("letterswithbasicpunc", function(value, element) {
+ return this.optional(element) || /^[a-z-.,()'\"\s]+$/i.test(value);
+}, "Letters or punctuation only please");
+
+jQuery.validator.addMethod("alphanumeric", function(value, element) {
+ return this.optional(element) || /^\w+$/i.test(value);
+}, "Letters, numbers, spaces or underscores only please");
+
+jQuery.validator.addMethod("lettersonly", function(value, element) {
+ return this.optional(element) || /^[a-z]+$/i.test(value);
+}, "Letters only please");
+
+jQuery.validator.addMethod("nowhitespace", function(value, element) {
+ return this.optional(element) || /^\S+$/i.test(value);
+}, "No white space please");
+
+jQuery.validator.addMethod("ziprange", function(value, element) {
+ return this.optional(element) || /^90[2-5]\d\{2}-\d{4}$/.test(value);
+}, "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx");
+
+jQuery.validator.addMethod("integer", function(value, element) {
+ return this.optional(element) || /^-?\d+$/.test(value);
+}, "A positive or negative non-decimal number please");
+
+/**
+* Return true, if the value is a valid vehicle identification number (VIN).
+*
+* Works with all kind of text inputs.
+*
+* @example <input type="text" size="20" name="VehicleID" class="{required:true,vinUS:true}" />
+* @desc Declares a required input element whose value must be a valid vehicle identification number.
+*
+* @name jQuery.validator.methods.vinUS
+* @type Boolean
+* @cat Plugins/Validate/Methods
+*/
+jQuery.validator.addMethod(
+ "vinUS",
+ function(v){
+ if (v.length != 17)
+ return false;
+ var i, n, d, f, cd, cdv;
+ var LL = ["A","B","C","D","E","F","G","H","J","K","L","M","N","P","R","S","T","U","V","W","X","Y","Z"];
+ var VL = [1,2,3,4,5,6,7,8,1,2,3,4,5,7,9,2,3,4,5,6,7,8,9];
+ var FL = [8,7,6,5,4,3,2,10,0,9,8,7,6,5,4,3,2];
+ var rs = 0;
+ for(i = 0; i < 17; i++){
+ f = FL[i];
+ d = v.slice(i,i+1);
+ if(i == 8){
+ cdv = d;
+ }
+ if(!isNaN(d)){
+ d *= f;
+ }
+ else{
+ for(n = 0; n < LL.length; n++){
+ if(d.toUpperCase() === LL[n]){
+ d = VL[n];
+ d *= f;
+ if(isNaN(cdv) && n == 8){
+ cdv = LL[n];
+ }
+ break;
+ }
+ }
+ }
+ rs += d;
+ }
+ cd = rs % 11;
+ if(cd == 10){cd = "X";}
+ if(cd == cdv){return true;}
+ return false;
+ },
+ "The specified vehicle identification number (VIN) is invalid."
+);
+
+/**
+ * Return true, if the value is a valid date, also making this formal check dd/mm/yyyy.
+ *
+ * @example jQuery.validator.methods.date("01/01/1900")
+ * @result true
+ *
+ * @example jQuery.validator.methods.date("01/13/1990")
+ * @result false
+ *
+ * @example jQuery.validator.methods.date("01.01.1900")
+ * @result false
+ *
+ * @example <input name="pippo" class="{dateITA:true}" />
+ * @desc Declares an optional input element whose value must be a valid date.
+ *
+ * @name jQuery.validator.methods.dateITA
+ * @type Boolean
+ * @cat Plugins/Validate/Methods
+ */
+jQuery.validator.addMethod(
+ "dateITA",
+ function(value, element) {
+ var check = false;
+ var re = /^\d{1,2}\/\d{1,2}\/\d{4}$/;
+ if( re.test(value)){
+ var adata = value.split('/');
+ var gg = parseInt(adata[0],10);
+ var mm = parseInt(adata[1],10);
+ var aaaa = parseInt(adata[2],10);
+ var xdata = new Date(aaaa,mm-1,gg);
+ if ( ( xdata.getFullYear() == aaaa ) && ( xdata.getMonth () == mm - 1 ) && ( xdata.getDate() == gg ) )
+ check = true;
+ else
+ check = false;
+ } else
+ check = false;
+ return this.optional(element) || check;
+ },
+ "Please enter a correct date"
+);
+
+jQuery.validator.addMethod("dateNL", function(value, element) {
+ return this.optional(element) || /^\d\d?[\.\/-]\d\d?[\.\/-]\d\d\d?\d?$/.test(value);
+ }, "Vul hier een geldige datum in."
+);
+
+jQuery.validator.addMethod("time", function(value, element) {
+ return this.optional(element) || /^([01][0-9])|(2[0123]):([0-5])([0-9])$/.test(value);
+ }, "Please enter a valid time, between 00:00 and 23:59"
+);
+
+/**
+ * matches US phone number format
+ *
+ * where the area code may not start with 1 and the prefix may not start with 1
+ * allows '-' or ' ' as a separator and allows parens around area code
+ * some people may want to put a '1' in front of their number
+ *
+ * 1(212)-999-2345
+ * or
+ * 212 999 2344
+ * or
+ * 212-999-0983
+ *
+ * but not
+ * 111-123-5434
+ * and not
+ * 212 123 4567
+ */
+jQuery.validator.addMethod("phoneUS", function(phone_number, element) {
+ phone_number = phone_number.replace(/\s+/g, "");
+ return this.optional(element) || phone_number.length > 9 &&
+ phone_number.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
+}, "Please specify a valid phone number");
+
+jQuery.validator.addMethod('phoneUK', function(phone_number, element) {
+return this.optional(element) || phone_number.length > 9 &&
+phone_number.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/);
+}, 'Please specify a valid phone number');
+
+jQuery.validator.addMethod('mobileUK', function(phone_number, element) {
+return this.optional(element) || phone_number.length > 9 &&
+phone_number.match(/^((0|\+44)7(5|6|7|8|9){1}\d{2}\s?\d{6})$/);
+}, 'Please specify a valid mobile number');
+
+// TODO check if value starts with <, otherwise don't try stripping anything
+jQuery.validator.addMethod("strippedminlength", function(value, element, param) {
+ return jQuery(value).text().length >= param;
+}, jQuery.validator.format("Please enter at least {0} characters"));
+
+// same as email, but TLD is optional
+jQuery.validator.addMethod("email2", function(value, element, param) {
+ return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);
+}, jQuery.validator.messages.email);
+
+// same as url, but TLD is optional
+jQuery.validator.addMethod("url2", function(value, element, param) {
+ return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\
d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);
+}, jQuery.validator.messages.url);
+
+// NOTICE: Modified version of Castle.Components.Validator.CreditCardValidator
+// Redistributed under the the Apache License 2.0 at http://www.apache.org/licenses/LICENSE-2.0
+// Valid Types: mastercard, visa, amex, dinersclub, enroute, discover, jcb, unknown, all (overrides all other settings)
+jQuery.validator.addMethod("creditcardtypes", function(value, element, param) {
+
+ if (/[^0-9-]+/.test(value))
+ return false;
+
+ value = value.replace(/\D/g, "");
+
+ var validTypes = 0x0000;
+
+ if (param.mastercard)
+ validTypes |= 0x0001;
+ if (param.visa)
+ validTypes |= 0x0002;
+ if (param.amex)
+ validTypes |= 0x0004;
+ if (param.dinersclub)
+ validTypes |= 0x0008;
+ if (param.enroute)
+ validTypes |= 0x0010;
+ if (param.discover)
+ validTypes |= 0x0020;
+ if (param.jcb)
+ validTypes |= 0x0040;
+ if (param.unknown)
+ validTypes |= 0x0080;
+ if (param.all)
+ validTypes = 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 0x0020 | 0x0040 | 0x0080;
+
+ if (validTypes & 0x0001 && /^(51|52|53|54|55)/.test(value)) { //mastercard
+ return value.length == 16;
+ }
+ if (validTypes & 0x0002 && /^(4)/.test(value)) { //visa
+ return value.length == 16;
+ }
+ if (validTypes & 0x0004 && /^(34|37)/.test(value)) { //amex
+ return value.length == 15;
+ }
+ if (validTypes & 0x0008 && /^(300|301|302|303|304|305|36|38)/.test(value)) { //dinersclub
+ return value.length == 14;
+ }
+ if (validTypes & 0x0010 && /^(2014|2149)/.test(value)) { //enroute
+ return value.length == 15;
+ }
+ if (validTypes & 0x0020 && /^(6011)/.test(value)) { //discover
+ return value.length == 16;
+ }
+ if (validTypes & 0x0040 && /^(3)/.test(value)) { //jcb
+ return value.length == 16;
+ }
+ if (validTypes & 0x0040 && /^(2131|1800)/.test(value)) { //jcb
+ return value.length == 15;
+ }
+ if (validTypes & 0x0080) { //unknown
+ return true;
+ }
+ return false;
+}, "Please enter a valid credit card number.");
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/branches/jquery/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js
------------------------------------------------------------------------------
svn:mime-type = text/plain