svn commit: r1305581 [32/36] - in /ofbiz/branches/20111205EmailH
Locked
svn commit: r1305581 [32/36] - in /ofbiz/branches/20111205EmailH
 
|
Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/config/ecommerce.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/config/ecommerce.properties?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/config/ecommerce.properties (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/config/ecommerce.properties Mon Mar 26 20:56:02 2012 @@ -17,3 +17,29 @@ # under the License. ############################################################################### convertProductPriceCurrency=true + +############################################ +# Janrain Engage +############################################ +#example config +#janrain.apiKey=9640f5bddc863ec419067d4bd07f9d15e45c177f +#janrain.baseUrl=https://ofbizdemo.rpxnow.com +#janrain.appName=ofbizdemo +############################################ + +# -- Enabled janrain engage (Y/ N) default N +janrain.enabled=N + +# -- Janrain api key (secret) +janrain.apiKey= + +# -- Janrain application domain +janrain.baseUrl= + +# -- Janrain application name +janrain.appName= + +# Tag Cloud +tagcloud.min.fontsize = 8 +tagcloud.max.fontsize = 14 +tagcloud.limit = 99 Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml Mon Mar 26 20:56:02 2012 @@ -122,7 +122,7 @@ under the License. <PartyRole partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER"/> <PartyGeoPoint partyId="DemoCustomer" geoPointId="9000" fromDate="2009-01-09 00:00:00.000"/> <PartyRelationship partyIdFrom="DemoCustCompany" roleTypeIdFrom="ACCOUNT" partyIdTo="DemoCustomer" roleTypeIdTo="CONTACT" fromDate="2000-01-01 00:00:00.000" partyRelationshipTypeId="EMPLOYMENT"/> - + <UserLoginSecurityGroup groupId="ECOMMERCE_CUSTOMER" userLoginId="DemoCustomer" fromDate="2000-01-01 00:00:00.0"/> <ContactMech contactMechId="9015" contactMechTypeId="POSTAL_ADDRESS"/> <PostalAddress contactMechId="9015" toName="Demo Customer" address1="2004 Factory Blvd" city="Orem" stateProvinceGeoId="UT" postalCode="84057" countryGeoId="USA" geoPointId="9000"/> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoProduct.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoProduct.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoProduct.xml Mon Mar 26 20:56:02 2012 @@ -737,6 +737,93 @@ under the License. <ContentAssoc contentId="SV-1001-ALT" contentIdTo="CSV-1001-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-08-02 12:00:00.0"/> <ProductContent productId="SV-1001" contentId="SV-1001-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2011-08-02 12:00:00.0"/> + <!-- test for the configurable product type which is received to- and shipped from inventory--> + <Product productId="CFSV1001" productTypeId="AGGREGATED_SERVICE" primaryProductCategoryId="SERV-001" productName="Scanning book service" internalName="The configurable product type which is received to- and shipped from inventory" description="The configurable product type which is received to- and shipped from inventory for demonstration use" taxable="Y" chargeShipping="N" autoCreateKeywords="Y" isVirtual="N" isVariant="N" createdDate="2008-12-02 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2008-12-02 12:00:00.0" lastModifiedByUserLogin="admin"/> + <Product productId="SCAN_TYPE" productTypeId="SERVICE_PRODUCT" productName="Scanning Type" internalName="Scanning Type" description="Scanning Type" isVirtual="Y" isVariant="N" billOfMaterialLevel="0" createdDate="2004-08-20 12:50:54.794" createdByUserLogin="admin"/> + <Product productId="SCAN-EC" productTypeId="SERVICE_PRODUCT" internalName="Economy Scanning type" productName="Economy Scanning type" description="Economy Scanning type" returnable="N" includeInPromotions="N" taxable="N" chargeShipping="N" isVirtual="N" isVariant="Y" createdDate="2003-11-20 13:48:19.105" createdByUserLogin="admin" lastModifiedDate="2003-11-20 13:48:19.105" lastModifiedByUserLogin="admin"/> + <Product productId="SCAN-ST" productTypeId="SERVICE_PRODUCT" internalName="Standard Scanning type" productName="Standard Scanning type" description="Standard Scanning type" returnable="N" includeInPromotions="N" taxable="N" chargeShipping="N" isVirtual="N" isVariant="Y" createdDate="2003-11-20 13:48:19.105" createdByUserLogin="admin" lastModifiedDate="2003-11-20 13:48:19.105" lastModifiedByUserLogin="admin"/> + <Product productId="SCAN-SU" productTypeId="SERVICE_PRODUCT" internalName="Superfine Scanning type" productName="Superfine Scanning type" description="Superfine Scanning type" returnable="N" includeInPromotions="N" taxable="N" chargeShipping="N" isVirtual="N" isVariant="Y" createdDate="2003-11-20 13:48:19.105" createdByUserLogin="admin" lastModifiedDate="2003-11-20 13:48:19.105" lastModifiedByUserLogin="admin"/> + + <ProductFeatureCategory productFeatureCategoryId="SCAN_TYPE" description="Scanning Type"/> + <ProductFeature productFeatureId="ECONOMY" productFeatureTypeId="TYPE" productFeatureCategoryId="SCAN_TYPE" description="Economy Scan" defaultSequenceNum="1"/> + <ProductFeature productFeatureId="STANDARD" productFeatureTypeId="TYPE" productFeatureCategoryId="SCAN_TYPE" description="Standard Scan" defaultSequenceNum="2"/> + <ProductFeature productFeatureId="SUPERFINE" productFeatureTypeId="TYPE" productFeatureCategoryId="SCAN_TYPE" description="Superfine Scan" defaultSequenceNum="3"/> + + <Product productId="EXPRESS" productTypeId="SERVICE_PRODUCT" productName="Express" internalName="Express" description="Express" isVirtual="N" isVariant="N" billOfMaterialLevel="0" createdDate="2007-12-27 12:00:00.0" createdByUserLogin="admin"/> + <Product productId="SUPER_EXPRESS" productTypeId="SERVICE_PRODUCT" productName="Super Express" internalName="Super Express" description="Super Express" isVirtual="N" isVariant="N" billOfMaterialLevel="0" createdDate="2007-12-27 12:00:00.0" createdByUserLogin="admin"/> + <Product productId="SCAN_COVER" productTypeId="SERVICE_PRODUCT" productName="Scan Cover" internalName="Scan Cover" description="Scan Cover" isVirtual="N" isVariant="N" billOfMaterialLevel="0" createdDate="2007-12-27 12:00:00.0" createdByUserLogin="admin"/> + <Product productId="OCR" productTypeId="SERVICE_PRODUCT" productName="OCR" internalName="OCR" description="OCR" isVirtual="N" isVariant="N" billOfMaterialLevel="0" createdDate="2007-12-27 12:00:00.0" createdByUserLogin="admin"/> + <Product productId="METADATA" productTypeId="SERVICE_PRODUCT" productName="Metadata" internalName="Metadata" description="Metadata" isVirtual="N" isVariant="N" billOfMaterialLevel="0" createdDate="2007-12-27 12:00:00.0" createdByUserLogin="admin"/> + <Product productId="DVD" productTypeId="SERVICE_PRODUCT" productName="DVD" internalName="DVD" description="DVD" isVirtual="N" isVariant="N" billOfMaterialLevel="0" createdDate="2007-12-27 12:00:00.0" createdByUserLogin="admin"/> + + <ProductAssoc productId="SCAN_TYPE" productIdTo="SCAN-EC" productAssocTypeId="PRODUCT_VARIANT" fromDate="2011-08-02 12:00:00.0"/> + <ProductAssoc productId="SCAN_TYPE" productIdTo="SCAN-ST" productAssocTypeId="PRODUCT_VARIANT" fromDate="2011-08-02 12:00:00.0"/> + <ProductAssoc productId="SCAN_TYPE" productIdTo="SCAN-SU" productAssocTypeId="PRODUCT_VARIANT" fromDate="2011-08-02 12:00:00.0"/> + + <ProductFeatureAppl productId="SCAN_TYPE" productFeatureId="ECONOMY" productFeatureApplTypeId="SELECTABLE_FEATURE" fromDate="2011-08-02 12:00:00.0" sequenceNum="1"/> + <ProductFeatureAppl productId="SCAN_TYPE" productFeatureId="STANDARD" productFeatureApplTypeId="SELECTABLE_FEATURE" fromDate="2011-08-02 12:00:00.0" sequenceNum="2"/> + <ProductFeatureAppl productId="SCAN_TYPE" productFeatureId="SUPERFINE" productFeatureApplTypeId="SELECTABLE_FEATURE" fromDate="2011-08-02 12:00:00.0" sequenceNum="3"/> + + <ProductFeatureAppl productId="SCAN-EC" productFeatureId="ECONOMY" productFeatureApplTypeId="STANDARD_FEATURE" fromDate="2011-08-02 12:00:00.0" sequenceNum="1"/> + <ProductFeatureAppl productId="SCAN-ST" productFeatureId="STANDARD" productFeatureApplTypeId="STANDARD_FEATURE" fromDate="2011-08-02 12:00:00.0" sequenceNum="1"/> + <ProductFeatureAppl productId="SCAN-SU" productFeatureId="SUPERFINE" productFeatureApplTypeId="STANDARD_FEATURE" fromDate="2011-08-02 12:00:00.0" sequenceNum="1"/> + + <ProductPrice productId="CFSV1001" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-08-02 12:00:00.0" price="9.99" createdDate="2011-08-02 12:00:00.0" createdByUserLogin="admin"/> + <ProductPrice productId="SCAN-EC" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-01-01 00:00:00.0" price="1.00" createdDate="2011-01-01 00:00:00.0"/> + <ProductPrice productId="SCAN-EC" productPricePurposeId="COMPONENT_PRICE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-01-01 00:00:00.0" price="1.00" createdDate="2011-01-01 00:00:00.0"/> + <ProductPrice productId="SCAN-ST" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-01-01 00:00:00.0" price="2.00" createdDate="2011-01-01 00:00:00.0"/> + <ProductPrice productId="SCAN-ST" productPricePurposeId="COMPONENT_PRICE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-01-01 00:00:00.0" price="2.00" createdDate="2011-01-01 00:00:00.0"/> + <ProductPrice productId="SCAN-SU" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-01-01 00:00:00.0" price="3.00" createdDate="2011-01-01 00:00:00.0"/> + <ProductPrice productId="SCAN-SU" productPricePurposeId="COMPONENT_PRICE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-01-01 00:00:00.0" price="3.00" createdDate="2011-01-01 00:00:00.0"/> + <ProductPrice productId="EXPRESS" productPricePurposeId="COMPONENT_PRICE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-01-01 00:00:00.0" price="1.50" createdDate="2011-01-01 00:00:00.0"/> + <ProductPrice productId="SUPER_EXPRESS" productPricePurposeId="COMPONENT_PRICE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-01-01 00:00:00.0" price="3.00" createdDate="2011-01-01 00:00:00.0"/> + <ProductPrice productId="SCAN_COVER" productPricePurposeId="COMPONENT_PRICE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-01-01 00:00:00.0" price="1.00" createdDate="2011-01-01 00:00:00.0"/> + <ProductPrice productId="OCR" productPricePurposeId="COMPONENT_PRICE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-01-01 00:00:00.0" price="2.00" createdDate="2011-01-01 00:00:00.0"/> + <ProductPrice productId="METADATA" productPricePurposeId="COMPONENT_PRICE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-01-01 00:00:00.0" price="1.00" createdDate="2011-01-01 00:00:00.0"/> + <ProductPrice productId="DVD" productPricePurposeId="COMPONENT_PRICE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2011-01-01 00:00:00.0" price="0.25" createdDate="2011-01-01 00:00:00.0"/> + + <ProductConfigItem configItemId="SC00000" configItemTypeId="MULTIPLE" configItemName="Scanning Type" description="Select the scanning type :"/> + <ProductConfigItem configItemId="SCF0001" configItemTypeId="MULTIPLE" configItemName="Scanning Options" description="Scanning options :"/> + + <ProductConfigOption configItemId="SC00000" configOptionId="SCOP001" configOptionName="OPT0001" description="Scanning Type" sequenceNum="10"/> + <ProductConfigOption configItemId="SCF0001" configOptionId="SCOP006" configOptionName="OPT0006" description="Express" sequenceNum="10"/> + <ProductConfigOption configItemId="SCF0001" configOptionId="SCOP007" configOptionName="OPT0007" description="Super Express" sequenceNum="20"/> + <ProductConfigOption configItemId="SCF0001" configOptionId="SCOP008" configOptionName="OPT0008" description="Scan Cover" sequenceNum="30"/> + <ProductConfigOption configItemId="SCF0001" configOptionId="SCOP009" configOptionName="OPT0009" description="OCR" sequenceNum="40"/> + <ProductConfigOption configItemId="SCF0001" configOptionId="SCOP010" configOptionName="OPT0010" description="Metadata" sequenceNum="60"/> + <ProductConfigOption configItemId="SCF0001" configOptionId="SCOP011" configOptionName="OPT0011" description="DVD" sequenceNum="50"/> + + <ProductConfigProduct configItemId="SC00000" configOptionId="SCOP001" productId="SCAN_TYPE" quantity="1"/> + <ProductConfigProduct configItemId="SCF0001" configOptionId="SCOP006" productId="EXPRESS" quantity="1"/> + <ProductConfigProduct configItemId="SCF0001" configOptionId="SCOP007" productId="SUPER_EXPRESS" quantity="1"/> + <ProductConfigProduct configItemId="SCF0001" configOptionId="SCOP008" productId="SCAN_COVER" quantity="1"/> + <ProductConfigProduct configItemId="SCF0001" configOptionId="SCOP009" productId="OCR" quantity="1"/> + <ProductConfigProduct configItemId="SCF0001" configOptionId="SCOP010" productId="METADATA" quantity="1"/> + <ProductConfigProduct configItemId="SCF0001" configOptionId="SCOP011" productId="DVD" quantity="1"/> + + <ProductCategoryMember productCategoryId="SERV-001" productId="CFSV1001" fromDate="2011-08-02 12:00:00.0"/> + <ProductCategoryMember productCategoryId="CATALOG1_SEARCH" productId="CFSV1001" fromDate="2011-08-02 12:00:00.0"/> + <DataResource dataResourceId="CFSV1001-ALT" dataResourceTypeId="LINK" objectInfo="scanning-book-service-CFSV1001-p"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="CFSV1001-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRCFSV1001-ALTEN" localeString="en_US"/> + <ElectronicText dataResourceId="CFSV1001-ALT" textData="scanning-book-product"/> + <ElectronicText dataResourceId="DRCFSV1001-ALTEN" textData="scanning-book-product"/> + + <ProductConfig productId="CFSV1001" configItemId="SC00000" sequenceNum="10" fromDate="2011-01-01 00:00:00.0" description="Select the scanning type :" configTypeId="QUESTION" isMandatory="N"/> + <ProductConfig productId="CFSV1001" configItemId="SCF0001" sequenceNum="20" fromDate="2011-01-01 00:00:00.0" description="Scanning options :" configTypeId="QUESTION" isMandatory="N"/> + + <WorkEffort workEffortId="SCTASK01" workEffortTypeId="ROU_TASK" workEffortPurposeTypeId="ROU_ASSEMBLING" currentStatusId="ROU_ACTIVE" workEffortName="Stock out" description="Components" revisionNumber="1" fixedAssetId="DEMO_BOOK_GROUP" estimatedMilliSeconds="600000" estimatedSetupMillis="0"/> + <WorkEffort workEffortId="SCTASK02" workEffortTypeId="ROU_TASK" workEffortPurposeTypeId="ROU_ASSEMBLING" currentStatusId="ROU_ACTIVE" workEffortName="Preparation" description="Preparation" revisionNumber="1" fixedAssetId="DEMO_BOOK_GROUP" estimatedMilliSeconds="900000" estimatedSetupMillis="0"/> + <WorkEffort workEffortId="SCROUT01" workEffortTypeId="ROUTING" currentStatusId="ROU_ACTIVE" workEffortName="Pizza preparation" description="Scanning preparation" revisionNumber="1" quantityToProduce="0"/> + <WorkEffortGoodStandard workEffortId="SCROUT01" productId="CFSV1001" workEffortGoodStdTypeId="ROU_PROD_TEMPLATE" statusId="WEGS_CREATED" fromDate="2011-01-01 00:00:00.0"/> + <WorkEffortAssoc workEffortIdFrom="SCROUT01" workEffortIdTo="SCTASK01" workEffortAssocTypeId="ROUTING_COMPONENT" sequenceNum="10" fromDate="2011-01-01 00:00:00.0"/> + <WorkEffortAssoc workEffortIdFrom="SCROUT01" workEffortIdTo="SCTASK02" workEffortAssocTypeId="ROUTING_COMPONENT" sequenceNum="20" fromDate="2011-01-01 00:00:00.0"/> + + <Content contentId="CFSV1001-ALT" contentTypeId="DOCUMENT" dataResourceId="CFSV1001-ALT" localeString="en"/> + <Content contentId="CCFSV1001-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRCFSV1001-ALTEN" localeString="en_US"/> + <ContentAssoc contentId="CFSV1001-ALT" contentIdTo="CCFSV1001-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-08-02 12:00:00.0"/> + <ProductContent productId="CFSV1001" contentId="CFSV1001-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2011-08-02 12:00:00.0"/> + <ProductFeatureCategory productFeatureCategoryId="8000" description="License Features"/> <ProductFeatureCategoryAppl productFeatureCategoryId="8000" productCategoryId="CATALOG1_SEARCH" fromDate="2001-05-13 12:00:00.0"/> @@ -1575,4 +1662,29 @@ under the License. <ProductFacilityLocation productId="RentalShip" facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL01" minimumStock="5" moveQuantity="20"/> <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="InventoryRentalShip" inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01 08:00:00.000" productId="RentalShip" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/> <InventoryItemDetail inventoryItemId="InventoryRentalShip" inventoryItemDetailSeqId="0001" effectiveDate="2011-09-01 12:00:00.0" availableToPromiseDiff="10" quantityOnHandDiff="10" accountingQuantityDiff="10"/> + + <!-- Demo product tags --> + <ProductKeyword productId="GZ-1000" keyword="gizmos" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="GZ-1001" keyword="gizmos" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="GZ-2002" keyword="gizmos" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="GZ-2644" keyword="gizmos" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="GZ-5005" keyword="gizmos" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="WG-1111" keyword="red" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="GZ-1004" keyword="red" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="GZ-2644" keyword="red" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="SV-1001" keyword="demonstration" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="SV-1000" keyword="demonstration" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="CFSV1001" keyword="demonstration" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="WG-5569" keyword="widget" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="WG-9943" keyword="widget" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="GZ-1000" keyword="small" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="GZ-2644" keyword="small" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="SV-1001" keyword="service" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="CFSV1001" keyword="service" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="GZ-1000" keyword="tiny" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="GZ-8544" keyword="big" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="WG-9943" keyword="black" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="WG-1111" keyword="chrome" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + <ProductKeyword productId="GZ-1006" keyword="standard" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/> + </entity-engine-xml> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/ofbiz-component.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/ofbiz-component.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/ofbiz-component.xml Mon Mar 26 20:56:02 2012 @@ -25,8 +25,8 @@ under the License. <classpath type="jar" location="build/lib/*"/> <classpath type="dir" location="config"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/EcommerceTypeData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/EcommerceSecurityData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProduct.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProductImages.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoSurvey.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRentalShipping.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoShipping.xml"/> @@ -39,6 +39,7 @@ under the License. <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRelatedData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoConfigurator.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRentalProduct.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProductImages.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoTaxAuthority.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoOrderPeopleData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoOrderTestData.xml"/> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Mon Mar 26 20:56:02 2012 @@ -435,6 +435,12 @@ under the License. <call-service-asynch service-name="sendMailFromScreen" in-map-name="emailParams" include-user-login="true"/> </if-not-empty> </if-not-empty> + + <!-- security for manage profile --> + <set field="securityParams.userLoginId" from-field="createdUserLogin.userLoginId"/> + <set field="securityParams.groupId" value="ECOMMERCE_CUSTOMER"/> + <set field="securityParams.userLogin" from-field="userLogin"/> + <call-service service-name="addUserLoginToSecurityGroup" in-map-name="securityParams"/> <!-- tell the control servlet that we just logged in the user... --> <set value="TRUE" field="_LOGIN_PASSED_"/> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy Mon Mar 26 20:56:02 2012 @@ -62,7 +62,7 @@ if (miniProduct && productStoreId && pro } // get aggregated product totalPrice - if ("AGGREGATED".equals(miniProduct.productTypeId)) { + if ("AGGREGATED".equals(miniProduct.productTypeId) || "AGGREGATED_SERVICE".equals(miniProduct.productTypeId)) { configWrapper = ProductConfigWorker.getProductConfigWrapper(optProductId, cart.getCurrency(), request); if (configWrapper) { configWrapper.setDefaultConfig(); Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy Mon Mar 26 20:56:02 2012 @@ -51,6 +51,7 @@ if (userLogin) { creditCard = paymentMethod.getRelatedOne("CreditCard"); context.paymentMethodTypeId = "CREDIT_CARD"; context.cardNumber = creditCard.cardNumber; + context.cardType = creditCard.cardType; context.paymentMethodId = creditCard.paymentMethodId; context.firstNameOnCard = creditCard.firstNameOnCard; context.lastNameOnCard = creditCard.lastNameOnCard; Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/NewCustomer.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/NewCustomer.groovy?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/NewCustomer.groovy (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/NewCustomer.groovy Mon Mar 26 20:56:02 2012 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.product.store.ProductStoreWorker; @@ -49,3 +50,21 @@ if (previousParams) { previousParams = ""; } context.previousParams = previousParams; + +//the parameters from janrain +userInfoMap = request.getAttribute("userInfoMap"); +if (!userInfoMap) { + userInfoMap = request.getSession().getAttribute("userInfoMap"); +} +if (userInfoMap) { + if (userInfoMap.givenName && userInfoMap.familyName) { + requestParameters.USER_FIRST_NAME = userInfoMap.givenName; + requestParameters.USER_LAST_NAME = userInfoMap.familyName; + } else if (userInfoMap.formatted) { + requestParameters.USER_FIRST_NAME = userInfoMap.formatted; + } + requestParameters.CUSTOMER_EMAIL = userInfoMap.email; + requestParameters.preferredUsername = userInfoMap.preferredUsername; + requestParameters.USERNAME = userInfoMap.preferredUsername; + request.getSession().setAttribute("userInfoMap", userInfoMap); +} Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Mar 26 20:56:02 2012 @@ -30,12 +30,6 @@ under the License. <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/> <handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/> <handler name="rome" type="request" class="org.ofbiz.webapp.event.RomeEventHandler"/> - <!-- These event handlers have been deprecated, if you need to send json responses then chain - the json request from this controller after calling your event - <handler name="jsonsimple" type="request" class="org.ofbiz.webapp.event.JSONSimpleEventHandler"/> - <handler name="jsonservice" type="request" class="org.ofbiz.webapp.event.JSONServiceEventHandler"/> - <handler name="jsonjava" type="request" class="org.ofbiz.webapp.event.JSONJavaEventHandler"/> - --> <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> @@ -48,6 +42,7 @@ under the License. <event name="autoLoginCheck" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="autoLoginCheck"/> <event name="checkTrackingCodeCookies" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeCookies"/> <event name="setDefaultStoreSettings" type="java" path="org.ofbiz.product.product.ProductEvents" invoke="setDefaultStoreSettings"/> + <event name="createGuestShoppingListCookies" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="createGuestShoppingListCookies"/> <event name="restoreAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/> </firstvisit> @@ -75,6 +70,7 @@ under the License. <event name="restoreAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/> <!-- after login and restoring from the auto-save list, save everything to the auto-save list to handle anything that may have already been in the cart before login --> <event name="saveCartToAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="saveCartToAutoSaveList"/> + <event name="clearGuestShoppingListCookies" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="clearGuestShoppingListCookies"/> </after-login> <!-- default request; call into CMS --> @@ -906,6 +902,12 @@ under the License. <response name="success" type="view" value="keywordsearch"/> <response name="none" type="none" value=""/> </request-map> + <request-map uri="tagsearch"> + <security https="false" auth="false"/> + <event type="java" path="org.ofbiz.product.product.ProductSearchSession" invoke="checkDoKeywordOverride"/> + <response name="success" type="view" value="tagsearch"/> + <response name="none" type="none" value=""/> + </request-map> <request-map uri="clearSearchOptionsHistoryList"> <security https="false" auth="false"/> <event type="java" path="org.ofbiz.product.product.ProductSearchSession" invoke="clearSearchOptionsHistoryList"/> @@ -1490,6 +1492,12 @@ under the License. <security https="true" auth="false"/> <response name="success" type="view" value="viewcontent"/> </request-map> + <request-map uri="img"> + <security auth="false" https="false"/> + <event type="java" path="org.ofbiz.content.data.DataEvents" invoke="serveImage"/> + <response name="success" type="none"/> + <response name="error" type="view" value="main"/> + </request-map> <!-- TO BE REMOVED <request-map uri="createforumarticle"> @@ -1998,7 +2006,24 @@ under the License. <security https="true" auth="false"/> <response name="success" type="view" value="showShoppingList" save-current-view="true"/> </request-map> - + + <!-- Product Tags --> + <request-map uri="addProductTags"> + <security https="false" auth="false"/> + <event type="java" path="org.ofbiz.product.product.ProductEvents" invoke="addProductTags"/> + <response name="success" type="view-last" save-current-view="true"/> + <response name="error" type="view-last" save-current-view="true"/> + </request-map> + + <!-- ============== Janrain Engage ============== --> + <request-map uri="janrainCheckLogin"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.ecommerce.janrain.JanrainHelper" invoke="janrainCheckLogin"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="login"/> + <response name="userLoginMissing" type="request" value="newcustomer"/> + </request-map> + <!-- End of Request Mappings --> <!-- View Mappings --> @@ -2025,6 +2050,7 @@ under the License. <view-map name="productReview" type="screen" page="component://ecommerce/widget/CatalogScreens.xml#productreview"/> <view-map name="keywordsearch" type="screen" page="component://ecommerce/widget/CatalogScreens.xml#keywordsearch"/> + <view-map name="tagsearch" type="screen" page="component://ecommerce/widget/CatalogScreens.xml#tagsearch"/> <view-map name="advancedsearch" type="screen" page="component://ecommerce/widget/CatalogScreens.xml#advancedsearch"/> <view-map name="tellafriend" type="screen" page="component://ecommerce/widget/CatalogScreens.xml#tellafriend"/> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Mon Mar 26 20:56:02 2012 @@ -84,7 +84,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/error:/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value> + <param-value>/error:/control:/products:/select:/index.html:/index.jsp:/robots.txt:/default.html:/default.jsp:/images</param-value> </init-param> </filter> <filter-mapping> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Mon Mar 26 20:56:02 2012 @@ -272,7 +272,17 @@ function setAlternateGwp(field) { <#-- this is a non-product item --> ${cartLine.getItemTypeDescription()?if_exists}: ${cartLine.getName()?if_exists} </#if> - + <#assign attrs = cartLine.getOrderItemAttributes()/> + <#if attrs?has_content> + <#assign attrEntries = attrs.entrySet()/> + <ul> + <#list attrEntries as attrEntry> + <li> + ${attrEntry.getKey()} : ${attrEntry.getValue()} + </li> + </#list> + </ul> + </#if> <#if (cartLine.getIsPromo() && cartLine.getAlternativeOptionProductIds()?has_content)> <#-- Show alternate gifts if there are any... --> <div class="tableheadtext">${uiLabelMap.OrderChooseFollowingForGift}:</div> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Mon Mar 26 20:56:02 2012 @@ -190,7 +190,7 @@ function getConfigDetails(event) { <#assign productLargeImageUrl = firstLargeImage> </#if> <#if productLargeImageUrl?string?has_content> - <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left' alt="" /></a> + <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' class='cssImgXLarge' align='left' alt="" /></a> </#if> </td> <td align="right" valign="top"> @@ -402,7 +402,7 @@ function getConfigDetails(event) { <#assign imageUrl = "/images/defaultImage.jpg"> </#if> <td align="center" valign="bottom"> - <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" alt="" /></a> + <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" class='cssImgSmall' alt="" /></a> <br /> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="buttontext">${key}</a> </td> @@ -463,7 +463,7 @@ function getConfigDetails(event) { </#if> <#assign image = question.content.get("IMAGE_URL")?if_exists> <#if image?string?has_content> - <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' border='0' width='200' align='left' alt="" /> + <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' class='cssImgXLarge' align='left' alt="" /> </#if> <#else> <div><a href='#${question.getConfigItem().getString("configItemId")}' class="buttontext">Details</a></div> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Mon Mar 26 20:56:02 2012 @@ -305,6 +305,17 @@ ${virtualVariantJavaScript?if_exists} } } //]]> +$(function(){ + $('a[id^=productTag_]').click(function(){ + var id = $(this).attr('id'); + var ids = id.split('_'); + var productTagStr = ids[1]; + if (productTagStr) { + $('#productTagStr').val(productTagStr); + $('#productTagsearchform').submit(); + } + }); +}) </script> <#macro showUnavailableVarients> @@ -353,7 +364,7 @@ ${virtualVariantJavaScript?if_exists} <#assign productLargeImageUrl = firstLargeImage /> </#if> <#if productLargeImageUrl?string?has_content> - <a href="javascript:popupDetail();"><img id="detailImage" src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:popupDetail();"><img id="detailImage" src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" class="cssImgXLarge" alt="" /></a> <input type="hidden" id="originalImage" name="originalImage" value="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" /> </#if> <#if !productLargeImageUrl?string?has_content> @@ -379,7 +390,7 @@ ${virtualVariantJavaScript?if_exists} <#assign productLargeImageUrl = firstLargeImage /> </#if> <#if productLargeImageUrl?string?has_content> - <a href="javascript:popupDetail();"><img id="detailImage" src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:popupDetail();"><img id="detailImage" src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" class="cssImgXLarge" alt="" /></a> <input type="hidden" id="originalImage" name="originalImage" value="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" /> </#if> <#if !productLargeImageUrl?string?has_content> @@ -389,22 +400,22 @@ ${virtualVariantJavaScript?if_exists} <div id="additionalImageBox"> <#if productAdditionalImage1?string?has_content> <div class="additionalImage"> - <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgXLarge" alt="" /></a> </div> </#if> <#if productAdditionalImage2?string?has_content> <div class="additionalImage"> - <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgXLarge" alt="" /></a> </div> </#if> <#if productAdditionalImage3?string?has_content> <div class="additionalImage"> - <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgXLarge" alt="" /></a> </div> </#if> <#if productAdditionalImage4?string?has_content> <div class="additionalImage"> - <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a> + <a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgXLarge" alt="" /></a> </div> </#if> </div> @@ -541,6 +552,11 @@ ${virtualVariantJavaScript?if_exists} <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="addform" style="margin: 0;"> <fieldset> <#assign inStock = true /> + <#assign commentEnable = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("order.properties", "order.item.comment.enable")> + <#if commentEnable.equals("Y")> + <#assign orderItemAttr = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("order.properties", "order.item.attr.prefix")> + ${uiLabelMap.CommonComment} <input type="text" name="${orderItemAttr}comment"/> + </#if> <#-- Variant Selection --> <#if product.isVirtual?if_exists?upper_case == "Y"> <#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE" && featureLists?has_content> @@ -730,7 +746,7 @@ ${virtualVariantJavaScript?if_exists} <#if !imageUrl?string?has_content> <#assign imageUrl = "/images/defaultImage.jpg" /> </#if> - <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" width="60" height="60" alt="" /></a> + <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" class="cssImgSmall" alt="" /></a> <br /> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a> </#if> @@ -860,5 +876,44 @@ ${virtualVariantJavaScript?if_exists} </#list> </div> </#if> + <div class="product-tags"> + <p class="titleProductTags"><h3>${uiLabelMap.EcommerceProductTags}</h3></p> + <#if productTags?exists> + <p class="titleAddTags"><strong>${uiLabelMap.EcommerceProductTagsDetail}:</strong></p> + <p> + <ul> + <li> + <#assign no = 0 /> + <#list productTags?keys?sort as productTag> + <#assign tagValue = productTags.get(productTag)?if_exists/> + <#if tagValue?has_content> + <span><a href="javascript:void(0);" id="productTag_${productTag}">${productTag}</a> (${tagValue}) <#if no < (productTags.size() - 1)> | </#if></span> + <#assign no = no + 1 /> + </#if> + </#list> + </li> + </ul> + </p> + </#if> + + <p class="titleAddTags"><strong>${uiLabelMap.EcommerceAddYourTags}:</strong></p> + <p> + <form method="post" action="<@ofbizUrl>addProductTags</@ofbizUrl>" name="addProductTags"> + <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input class="inputProductTags" type="text" value="" name="productTags" id="productTags" size="40"/> + <input class="buttonProductTags" type="submit" value="${uiLabelMap.EcommerceAddTags}" name="addTag"/> + </form> + <span>${uiLabelMap.EcommerceAddTagsDetail}</span> + </p> + </div> + <hr /> + <form action="<@ofbizUrl>tagsearch</@ofbizUrl>" method="post" name="productTagsearchform" id="productTagsearchform"> + <input type="hidden" name="keywordTypeId" value="KWT_TAG"/> + <input type="hidden" name="statusId" value="KW_APPROVED"/> + <input type="hidden" name="clearSearch" value="Y"/> + <input type="hidden" name="VIEW_SIZE" value="10"/> + <input type="hidden" name="PAGING" value="Y"/> + <input type="hidden" name="SEARCH_STRING" id="productTagStr"/> + </form> </div> </div> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Mon Mar 26 20:56:02 2012 @@ -342,15 +342,22 @@ will generally always be reserved for th <legend><#if getUsername>${uiLabelMap.CommonUsername}</#if></legend> <#if getUsername> <@fieldErrors fieldName="USERNAME"/> - <div class="form-row inline"> - <label for="UNUSEEMAIL"> - <input type="checkbox" class="checkbox" name="UNUSEEMAIL" id="UNUSEEMAIL" value="on" onclick="setEmailUsername();" onfocus="setLastFocused(this);"/> ${uiLabelMap.EcommerceUseEmailAddress} - </label> - </div> + <#if !requestParameters.preferredUsername?has_content> + <div class="form-row inline"> + <label for="UNUSEEMAIL"> + <input type="checkbox" class="checkbox" name="UNUSEEMAIL" id="UNUSEEMAIL" value="on" onclick="setEmailUsername();" onfocus="setLastFocused(this);"/> ${uiLabelMap.EcommerceUseEmailAddress} + </label> + </div> + </#if> <div> <label for="USERNAME">${uiLabelMap.CommonUsername}*</label> - <input type="text" name="USERNAME" id="USERNAME" value="${requestParameters.USERNAME?if_exists}" onfocus="clickUsername();" onchange="changeEmail();"/> + <#if requestParameters.preferredUsername?has_content> + <input type="text" name="showUserName" id="showUserName" value="${requestParameters.USERNAME?if_exists}" disabled="disabled"/> + <input type="hidden" name="USERNAME" id="USERNAME" value="${requestParameters.USERNAME?if_exists}"/> + <#else> + <input type="text" name="USERNAME" id="USERNAME" value="${requestParameters.USERNAME?if_exists}" onfocus="clickUsername();" onchange="changeEmail();"/> + </#if> </div> </#if> </fieldset> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Mon Mar 26 20:56:02 2012 @@ -415,8 +415,13 @@ under the License. <td>${(status.get("description",locale))?if_exists}</td> <td>${contentRole.fromDate?if_exists}</td> <td align="right"> + <form name="removeContent_${contentRole.contentId}" method="post" action="removePartyAsset"> + <input name="partyId" type="hidden" value="${userLogin.partyId}"/> + <input name="contentId" type="hidden" value="${contentRole.contentId}"/> + <input name="roleTypeId" type="hidden" value="${contentRole.roleTypeId}"/> + </form> <a href="<@ofbizUrl>img/${content.contentName?if_exists}?imgId=${content.dataResourceId?if_exists}</@ofbizUrl>" class="button">${uiLabelMap.CommonView}</a> - <a href="<@ofbizUrl>removePartyAsset?contentId=${contentRole.contentId}&partyId=${contentRole.partyId}&roleTypeId=${contentRole.roleTypeId}</@ofbizUrl>" class="button">${uiLabelMap.CommonRemove}</a> + <a href="javascript:document.removeContent_${contentRole.contentId}.submit();" class="button">${uiLabelMap.CommonRemove}</a> </td> </tr> </#list> @@ -596,6 +601,9 @@ ${screens.render('component://ecommerce/ <#-- Subscription Summary --> ${screens.render('component://ecommerce/widget/CustomerScreens.xml#SubscriptionSummary')} +<#-- Reviews --> +${screens.render('component://ecommerce/widget/CustomerScreens.xml#showProductReviews')} + <#else> <h3>${uiLabelMap.PartyNoPartyForCurrentUserName}: ${userLogin.userLoginId}</h3> </#if> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp Mon Mar 26 20:56:02 2012 @@ -16,9 +16,27 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --%> +<%@ page import="java.util.*" %> +<%@ page import="org.ofbiz.base.util.*" %> +<%@ page import="org.ofbiz.entity.*" %> +<%@ page import="org.ofbiz.entity.util.*" %> +<jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /> +<% +ServletContext context = pageContext.getServletContext(); +String webSiteId = (String) context.getAttribute("webSiteId"); +List<GenericValue> webAnalytics = delegator.findByAnd("WebAnalyticsConfig", UtilMisc.toMap("webSiteId", webSiteId)); +%> <html> <head> <title>Error 404</title> +<%if (webAnalytics != null) {%> +<script language="JavaScript" type="text/javascript"> +<%for (GenericValue webAnalytic : webAnalytics) {%> + <%=StringUtil.wrapString((String) webAnalytic.get("webAnalyticsCode"))%> +<%}%> +</script> +<%}%> +</head> <body> <p> <b>404.</b> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl Mon Mar 26 20:56:02 2012 @@ -59,7 +59,7 @@ under the License. <div class="screenlet-body"> <table> <tr><td align="right" nowrap="nowrap"><div class='tabletext'>${uiLabelMap.EcommerceImage}</div></td><td> </td><td><div class='tabletext'> - <img src="<@ofbizUrl>img?imgId=${imgDataResourceId?if_exists}</@ofbizUrl>" alt="" /> + <img src="<@ofbizUrl>img?imgId=${imgDataResourceId?if_exists}</@ofbizUrl>" alt="" class='cssImgStandard' /> <div></td></tr> </table> </div> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js Mon Mar 26 20:56:02 2012 @@ -144,11 +144,12 @@ function getServerError(data) { if (data._ERROR_MESSAGE_LIST_ != undefined) { serverErrorHash = data._ERROR_MESSAGE_LIST_; jQuery.each(serverErrorHash, function(i, error) { - serverError += error.message + '<br/>'; + var encodedErrorMessage = jQuery('<div/>').text(error.message).html(); + serverError += encodedErrorMessage + '<br/>'; }); } if (data._ERROR_MESSAGE_ != undefined) { - serverError = data._ERROR_MESSAGE_; + serverError = jQuery('<div/>').text(data._ERROR_MESSAGE_).html(); } return serverError; } @@ -257,7 +258,8 @@ function createUpdateCustomerAndShipping async: false, data: jQuery('#shippingForm').serialize(), success: function(json) { - if (!getServerError(json)) { + var serverError = getServerError(json); + if (!serverError) { jQuery('#shippingFormServerError').fadeOut('fast'); // Process Shipping data response. jQuery('#shipToPartyId').val(json.partyId); @@ -294,7 +296,8 @@ function getShipOptions() { type: 'POST', async: false, success: function(json) { - if (!getServerError(json)) { + var serverError = getServerError(json); + if (!serverError) { jQuery('#shippingFormServerError').fadeOut('fast'); isShipStepValidate = true; shipOptions = json.shippingOptions; @@ -338,7 +341,8 @@ function setShippingOption() { async: false, data: jQuery('#shippingOptionForm').serialize(), success: function(json) { - if (!getServerError(json)) { + var serverError = getServerError(json); + if (!serverError) { shipTotal = json.shippingTotal; isShipOptionStepValidate = true; jQuery('#selectedShipmentOption').html(json.shippingDescription); @@ -389,7 +393,8 @@ function processBillingAndPayment() { data: jQuery('#billingForm').serialize(), async: false, success: function(json) { - if (!getServerError(json)) { + var serverError = getServerError(json); + if (!serverError) { jQuery('#billingFormServerError').fadeOut('fast'); isBillStepValidate = true; jQuery('#billToContactMechId').val(json.contactMechId); @@ -398,7 +403,7 @@ function processBillingAndPayment() { updateBillingSummary(); result = true; } else { - jQuery('#shippingFormServerError').html(serverError); + jQuery('#billingFormServerError').html(serverError); result = false; } }, @@ -450,7 +455,8 @@ function addPromoCode() { type: 'POST', data: {"productPromoCodeId" : jQuery('#productPromoCode').val()}, success: function(json) { - if (!getServerError(json)) { + var serverError = getServerError(json); + if (!serverError) { jQuery('#cartFormServerError').fadeOut('fast'); updateCartData(); } else { @@ -477,7 +483,8 @@ function getProductLineItemIndex(event, async: false, data: formValues, success: function(json) { - if (!getServerError(json)) { + var serverError = getServerError(json); + if (!serverError) { itemIndex = json.itemIndex; } else { jQuery('#shippingFormServerError').html(serverError); @@ -520,7 +527,8 @@ function updateCartData(elementId, formV type: 'POST', data: formValues, success: function(json) { - if (!getServerError(json)) { + var serverError = getServerError(json); + if (!serverError) { if (json.totalQuantity == 0) { jQuery('#emptyCartCheckoutPanel').show(); jQuery('#checkoutPanel').hide(); Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/login.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/login.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/login.ftl Mon Mar 26 20:56:02 2012 @@ -16,35 +16,102 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> +<#assign janrainEnabled = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("ecommerce.properties", "janrain.enabled")> +<#assign appName = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("ecommerce.properties", "janrain.appName")> +<#if janrainEnabled == "Y"> +<script type="text/javascript"> +(function() { + if (typeof window.janrain !== 'object') window.janrain = {}; + window.janrain.settings = {}; + + janrain.settings.tokenUrl = '<@ofbizUrl fullPath="true" secure="true">janrainCheckLogin</@ofbizUrl>'; + function isReady() { janrain.ready = true; }; + if (document.addEventListener) { + document.addEventListener("DOMContentLoaded", isReady, false); + } else { + window.attachEvent('onload', isReady); + } + + var e = document.createElement('script'); + e.type = 'text/javascript'; + e.id = 'janrainAuthWidget'; + + if (document.location.protocol === 'https:') { + e.src = 'https://rpxnow.com/js/lib/${appName}/engage.js'; + } else { + e.src = 'http://widget-cdn.rpxnow.com/js/lib/${appName}/engage.js'; + } + + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(e, s); +})(); +</script> <h1>${uiLabelMap.CommonLogin}</h1> <div class="screenlet"> <div class="screenlet-title-bar"><h3>${uiLabelMap.CommonRegistered}</h3></div> <div class="screenlet-body"> - <form method="post" action="<@ofbizUrl>login</@ofbizUrl>" name="loginform" class="horizontal"> - <fieldset> - <div> - <label for="userName">${uiLabelMap.CommonUsername}</label> - <input type="text" id="userName" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/> - </div> -<#if autoUserLogin?has_content> - <p>(${uiLabelMap.CommonNot} ${autoUserLogin.userLoginId}? <a href="<@ofbizUrl>${autoLogoutUrl}</@ofbizUrl>">${uiLabelMap.CommonClickHere}</a>)</p> -</#if> - <div> - <label for="password">${uiLabelMap.CommonPassword}:</label> - <input type="password" id="password" name="PASSWORD" value=""/> - </div> - <div> - <input type="submit" class="button" value="${uiLabelMap.CommonLogin}"/> - </div> - <div> - <label for="newcustomer_submit">${uiLabelMap.CommonMayCreateNewAccountHere}:</label> - <a href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.CommonMayCreate}</a> - </div> - </fieldset> - </form> + <table width="100%" class="Signlogin"> + <tr> + <td> + <form method="post" action="<@ofbizUrl>login</@ofbizUrl>" name="loginform" class="horizontal"> + <fieldset> + <div> + <label for="userName">${uiLabelMap.CommonUsername}</label> + <input type="text" id="userName" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/> + </div> + <#if autoUserLogin?has_content> + <p>(${uiLabelMap.CommonNot} ${autoUserLogin.userLoginId}? <a href="<@ofbizUrl>${autoLogoutUrl}</@ofbizUrl>">${uiLabelMap.CommonClickHere}</a>)</p> + </#if> + <div> + <label for="password">${uiLabelMap.CommonPassword}:</label> + <input type="password" id="password" name="PASSWORD" value=""/> + </div> + <div> + <input type="submit" class="button" value="${uiLabelMap.CommonLogin}"/> + </div> + <div> + <label for="newcustomer_submit">${uiLabelMap.CommonMayCreateNewAccountHere}:</label> + <a href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.CommonMayCreate}</a> + </div> + </fieldset> + </form> + </td> + <td><div id="janrainEngageEmbed"></div></td> + </tr> + </table> </div> </div> +<#else> +<h1>${uiLabelMap.CommonLogin}</h1> +<div class="screenlet"> + <div class="screenlet-title-bar"><h3>${uiLabelMap.CommonRegistered}</h3></div> + <div class="screenlet-body"> + <form method="post" action="<@ofbizUrl>login</@ofbizUrl>" name="loginform" class="horizontal"> + <fieldset> + <div> + <label for="userName">${uiLabelMap.CommonUsername}</label> + <input type="text" id="userName" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/> + </div> + <#if autoUserLogin?has_content> + <p>(${uiLabelMap.CommonNot} ${autoUserLogin.userLoginId}? <a href="<@ofbizUrl>${autoLogoutUrl}</@ofbizUrl>">${uiLabelMap.CommonClickHere}</a>)</p> + </#if> + <div> + <label for="password">${uiLabelMap.CommonPassword}:</label> + <input type="password" id="password" name="PASSWORD" value=""/> + </div> + <div> + <input type="submit" class="button" value="${uiLabelMap.CommonLogin}"/> + </div> + <div> + <label for="newcustomer_submit">${uiLabelMap.CommonMayCreateNewAccountHere}:</label> + <a href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.CommonMayCreate}</a> + </div> + </fieldset> + </form> + </div> +</div> +</#if> <div class="screenlet"> <div class="screenlet-title-bar"><h3>${uiLabelMap.CommonForgotYourPassword}</h3></div> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl Mon Mar 26 20:56:02 2012 @@ -112,7 +112,7 @@ under the License. <td>${downloadOrderRoleAndProductContentInfo.contentName?if_exists}</td> <td>${downloadOrderRoleAndProductContentInfo.description?if_exists}</td> <td> - <a href="<@ofbizUrl>downloadDigitalProduct/${downloadOrderRoleAndProductContentInfo.contentName?if_exists}?dataResourceId=${downloadOrderRoleAndProductContentInfo.dataResourceId}</@ofbizUrl>" class="button">Download</a> + <a href="<@ofbizUrl>downloadDigitalProduct?dataResourceId=${downloadOrderRoleAndProductContentInfo.dataResourceId}</@ofbizUrl>" class="button">Download</a> </td> </tr> </#list> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Mon Mar 26 20:56:02 2012 @@ -123,6 +123,16 @@ under the License. <#assign product = orderItem.getRelatedOneCache("Product")?if_exists/> <#-- should always exist because of FK constraint, but just in case --> <td > <a href="<@ofbizCatalogAltUrl fullPath="true" secure="false" productId=orderItem.productId/>" class="linktext">${orderItem.productId} - ${orderItem.itemDescription?default("")}</a> + <#assign orderItemAttributes = orderItem.getRelated("OrderItemAttribute")/> + <#if orderItemAttributes?has_content> + <ul> + <#list orderItemAttributes as orderItemAttribute> + <li> + ${orderItemAttribute.attrName} : ${orderItemAttribute.attrValue} + </li> + </#list> + </ul> + </#if> <#if product?has_content> <#if product.piecesIncluded?exists && product.piecesIncluded?long != 0> [${uiLabelMap.OrderPieces}: ${product.piecesIncluded}] Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl Mon Mar 26 20:56:02 2012 @@ -180,7 +180,7 @@ function submitForm(form, mode, value) { <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if> <#if smallImageUrl?string?has_content> <a href="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>"> - <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" width="50" class="imageborder" border="0" alt="" /> + <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" class="cssImgSmall" alt="" /> </a> </#if> <#-- end code to display a small image of the product --> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Mon Mar 26 20:56:02 2012 @@ -432,8 +432,7 @@ under the License. <td align="right"><div class="tabletext"><b>${uiLabelMap.OrderTotal}</b></div></td> <td> </td> </tr> - - <#list shoppingListItemDatas[lowIndex..highIndex-1] as shoppingListItemData> + <#list shoppingListItemDatas[lowIndex-1..highIndex-1] as shoppingListItemData> <#assign shoppingListItem = shoppingListItemData.shoppingListItem/> <#assign product = shoppingListItemData.product/> <#assign productContentWrapper = Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(product, request)/> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/CatalogScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/CatalogScreens.xml Mon Mar 26 20:56:02 2012 @@ -430,6 +430,29 @@ under the License. </section> </screen> + <screen name="tagsearch"> + <section> + <actions> + <set field="leftbarScreenName" value="leftbar"/> + <set field="rightbarScreenName" value="rightbar"/> + <set field="MainColumnStyle" value="center"/> + + <set field="productsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/> + + <set field="titleProperty" value="PageTitleTagResults"/> + <set field="parameters.VIEW_SIZE" from-field="parameters.VIEW_SIZE" default-value="10"/> + <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/tagsearch.ftl"/></html></platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="advancedsearch"> <section> <actions> @@ -490,7 +513,7 @@ under the License. </widgets> </section> </screen> - <screen name="productCatagories"> + <screen name="productCategories"> <section> <actions> <set field="tabButtonItem" value="LookupProductCategories"/> @@ -505,7 +528,7 @@ under the License. <screen name="productCategoryList"> <section> <condition> - <if-empty field="parameters.mainSubmited"/> + <if-empty field="parameters.mainSubmitted"/> </condition> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> @@ -565,4 +588,16 @@ under the License. </widgets> </section> </screen> + + <screen name="populartags"> + <section> + <actions> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy"/> + </actions> + <widgets> + <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/populartags.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/CommonScreens.xml Mon Mar 26 20:56:02 2012 @@ -108,7 +108,7 @@ under the License. <include-screen name="choosecatalog" location="component://ecommerce/widget/CatalogScreens.xml"/> <include-screen name="keywordsearchbox" location="component://ecommerce/widget/CatalogScreens.xml"/> <!--include-screen name="sidedeepcategory" location="component://ecommerce/widget/CatalogScreens.xml"/--> - <include-screen name="productCatagories" location="component://ecommerce/widget/CatalogScreens.xml"/> + <include-screen name="productCategories" location="component://ecommerce/widget/CatalogScreens.xml"/> <include-screen name="LayeredNavBar" location="component://ecommerce/widget/CatalogScreens.xml"/> <include-screen name="minireorderprods" location="component://ecommerce/widget/CatalogScreens.xml"/> <include-screen name="signupforcontactlist" location="component://ecommerce/widget/EmailContactListScreens.xml"/> @@ -132,6 +132,7 @@ under the License. <include-screen name="minilastviewedproducts" location="component://ecommerce/widget/CatalogScreens.xml"/> <include-screen name="minilastproductsearches" location="component://ecommerce/widget/CatalogScreens.xml"/> <include-screen name="recentlyviewed" location="component://ecommerce/widget/ContentScreens.xml"/> + <include-screen name="populartags" location="component://ecommerce/widget/CatalogScreens.xml"/> </widgets> </section> </screen> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/CustomerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/CustomerScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/CustomerScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/CustomerScreens.xml Mon Mar 26 20:56:02 2012 @@ -620,4 +620,28 @@ under the License. </widgets> </section> </screen> + + <screen name="showProductReviews"> + <section> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerReviews.groovy"/> + </actions> + <widgets> + <section> + <condition> + <not> + <if-empty field="reviews"/> + </not> + </condition> + <widgets> + <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/viewreviews.ftl"/></html></platform-specific> + </widgets> + </section> + </widgets> + </section> + </screen> + + </screens> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/OrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/OrderScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/OrderScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/OrderScreens.xml Mon Mar 26 20:56:02 2012 @@ -616,7 +616,7 @@ under the License. <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy"/> - + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/OnePageCheckoutOptions.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/ShoppingListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/ShoppingListScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/ShoppingListScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/widget/ShoppingListScreens.xml Mon Mar 26 20:56:02 2012 @@ -44,7 +44,7 @@ under the License. <screen name="showShoppingList"> <section> <condition> - <if-empty field="parameters.mainSubmited"/> + <if-empty field="parameters.mainSubmitted"/> </condition> <actions> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java Mon Mar 26 20:56:02 2012 @@ -49,6 +49,7 @@ import org.ofbiz.entity.GenericEntityExc import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityOperator; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; @@ -633,7 +634,7 @@ public class ProductsExportToGoogle { result.put("newProductsInGoogle", newProductsInGoogle); result.put("productsRemovedFromGoogle", productsRemovedFromGoogle); result.put("localeString", localeString); - //Debug.log("======returning with result: " + result); + //Debug.logInfo("======returning with result: " + result, module); return result; } @@ -655,7 +656,7 @@ public class ProductsExportToGoogle { private static Map<String, Object> readResponseFromGoogle(String msg, List<String> newProductsInGoogle, List<String> productsRemovedFromGoogle, LocalDispatcher dispatcher, Delegator delegator, Locale locale, String localeString) { List<String> message = FastList.newInstance(); - // Debug.log("====get xml response from google: " + msg); + // Debug.logInfo("====get xml response from google: " + msg, module); try { Document docResponse = UtilXml.readXmlDocument(msg, true); Element elemResponse = docResponse.getDocumentElement(); @@ -737,11 +738,11 @@ public class ProductsExportToGoogle { buildGoogleBaseConfigContext.put("postItemsUrl", googleBaseConfig.getString("postItemsUrl")); } } else { - buildGoogleBaseConfigContext.put("developerKey", UtilProperties.getPropertyValue(configString, "googleBaseExport.developerKey")); - buildGoogleBaseConfigContext.put("authenticationUrl", UtilProperties.getPropertyValue(configString, "googleBaseExport.authenticationUrl")); - buildGoogleBaseConfigContext.put("accountEmail", UtilProperties.getPropertyValue(configString, "googleBaseExport.accountEmail")); - buildGoogleBaseConfigContext.put("accountPassword", UtilProperties.getPropertyValue(configString, "googleBaseExport.accountPassword")); - buildGoogleBaseConfigContext.put("postItemsUrl", UtilProperties.getPropertyValue(configString, "googleBaseExport.postItemsUrl")); + buildGoogleBaseConfigContext.put("developerKey", EntityUtilProperties.getPropertyValue(configString, "googleBaseExport.developerKey", delegator)); + buildGoogleBaseConfigContext.put("authenticationUrl", EntityUtilProperties.getPropertyValue(configString, "googleBaseExport.authenticationUrl", delegator)); + buildGoogleBaseConfigContext.put("accountEmail", EntityUtilProperties.getPropertyValue(configString, "googleBaseExport.accountEmail", delegator)); + buildGoogleBaseConfigContext.put("accountPassword", EntityUtilProperties.getPropertyValue(configString, "googleBaseExport.accountPassword", delegator)); + buildGoogleBaseConfigContext.put("postItemsUrl", EntityUtilProperties.getPropertyValue(configString, "googleBaseExport.postItemsUrl", delegator)); } return buildGoogleBaseConfigContext; } Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/googlebase/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/googlebase/widget/CommonScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/googlebase/widget/CommonScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/googlebase/widget/CommonScreens.xml Mon Mar 26 20:56:02 2012 @@ -91,7 +91,7 @@ under the License. <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> <label style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label> - <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content"/> + <image src="${product.smallImageUrl}" url-mode="content" style="cssImgSmall"/> </container> <!-- add Create Product and View Product (in ecommerce) links --> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |