svn commit: r1025485 [1/3] - in /ofbiz/branches/jquery: ./ applications/accounting/ applications/accounting/config
Locked
svn commit: r1025485 [1/3] - in /ofbiz/branches/jquery: ./ applications/accounting/ applications/accounting/config
 
|
Author: jleroux
Date: Wed Oct 20 10:47:53 2010 New Revision: 1025485 URL: http://svn.apache.org/viewvc?rev=1025485&view=rev Log: Merges the trunk at r1024555 Added: ofbiz/branches/jquery/applications/accounting/servicedef/services_securepay.xml - copied unchanged from r1024561, ofbiz/trunk/applications/accounting/servicedef/services_securepay.xml ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/ - copied from r1024561, ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/ ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java - copied unchanged from r1024561, ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java - copied unchanged from r1024561, ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java Removed: ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy ofbiz/branches/jquery/framework/common/webcommon/portal/editPortalPage.ftl ofbiz/branches/jquery/framework/common/webcommon/portal/portalPageHeader.ftl ofbiz/branches/jquery/framework/common/webcommon/portal/showPortalPage.ftl Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/.classpath ofbiz/branches/jquery/OPTIONAL_LIBRARIES ofbiz/branches/jquery/applications/accounting/build.xml ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml ofbiz/branches/jquery/applications/accounting/config/payment.properties ofbiz/branches/jquery/applications/accounting/config/paymentTest.properties ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml ofbiz/branches/jquery/applications/accounting/entitydef/entitymodel.xml ofbiz/branches/jquery/applications/accounting/lib/README ofbiz/branches/jquery/applications/accounting/ofbiz-component.xml ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml ofbiz/branches/jquery/applications/accounting/servicedef/services_paymentgateway.xml ofbiz/branches/jquery/applications/accounting/testdef/paymenttests.xml ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigForms.xml ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigScreens.xml ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml ofbiz/branches/jquery/applications/accounting/widget/ar/CommonScreens.xml ofbiz/branches/jquery/applications/commonext/widget/SystemInfoForms.xml ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/branches/jquery/applications/content/widget/content/ContentScreens.xml ofbiz/branches/jquery/applications/humanres/widget/PersonTrainingScreens.xml ofbiz/branches/jquery/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestForms.xml ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderForms.xml ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportScreens.xml ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventScreens.xml ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml ofbiz/branches/jquery/applications/product/data/ProductPortletData.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml ofbiz/branches/jquery/applications/product/widget/catalog/StoreForms.xml ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml ofbiz/branches/jquery/applications/product/widget/catalog/SubscriptionForms.xml ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/branches/jquery/applications/workeffort/widget/CalendarForms.xml ofbiz/branches/jquery/applications/workeffort/widget/CalendarScreens.xml ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml ofbiz/branches/jquery/framework/common/data/CommonSecurityData.xml ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/PortalPageMethods.xml ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/PortalPageServices.xml ofbiz/branches/jquery/framework/common/servicedef/services.xml ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/email/EmailServices.java ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/portal-controller.xml ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jquery/framework/common/widget/PortalPageForms.xml ofbiz/branches/jquery/framework/common/widget/PortalPageScreens.xml ofbiz/branches/jquery/framework/entity/build.xml ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml ofbiz/branches/jquery/framework/example/widget/example/ExampleScreens.xml ofbiz/branches/jquery/framework/example/widget/example/PortletScreens.xml ofbiz/branches/jquery/framework/webtools/data/WebtoolsSecurityData.xml ofbiz/branches/jquery/framework/webtools/webapp/webtools/main.ftl ofbiz/branches/jquery/framework/webtools/widget/CommonScreens.xml ofbiz/branches/jquery/framework/webtools/widget/Menus.xml ofbiz/branches/jquery/framework/webtools/widget/PortalAdmForms.xml ofbiz/branches/jquery/framework/webtools/widget/PortalAdmScreens.xml ofbiz/branches/jquery/framework/widget/dtd/widget-screen.xsd ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/PortalPageWorker.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java ofbiz/branches/jquery/framework/widget/templates/htmlScreenMacroLibrary.ftl ofbiz/branches/jquery/specialpurpose/build.xml ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed) 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) ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml ofbiz/branches/jquery/specialpurpose/myportal/widget/CommonScreens.xml ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 20 10:47:53 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-1022407 +/ofbiz/trunk:951708-1024561 Modified: ofbiz/branches/jquery/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/.classpath?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/.classpath (original) +++ ofbiz/branches/jquery/.classpath Wed Oct 20 10:47:53 2010 @@ -197,7 +197,7 @@ <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaycalls.jar"/> <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaysdkcore.jar"/> <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/helper.jar"/> - <classpathentry kind="src" path="applications/accounting/src" excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**"/> + <classpathentry kind="src" path="applications/accounting/src" excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**|org/ofbiz/accounting/thirdparty/securepay/**"/> <classpathentry kind="src" path="applications/content/src" excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/"/> <classpathentry kind="src" path="applications/manufacturing/src"/> <classpathentry kind="src" path="applications/marketing/src"/> Modified: ofbiz/branches/jquery/OPTIONAL_LIBRARIES URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/OPTIONAL_LIBRARIES?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/OPTIONAL_LIBRARIES (original) +++ ofbiz/branches/jquery/OPTIONAL_LIBRARIES Wed Oct 20 10:47:53 2010 @@ -168,6 +168,14 @@ on the old Undersun SVN server in the sp cybssecurity.jar TO BUILD comment out exclude: applications/accounting/build.xml:org/ofbiz/accounting/thirdparty/cybersource/** +-Securepay + applications/accounting/lib/cybersource: + Base64.jar + securepayxmlapi_obf.jar + xercesImpl-2.4.0.jar + xmlParserAPIs-2.4.0.jar + TO BUILD comment out exclude: applications/accounting/build.xml:org/ofbiz/accounting/thirdparty/securepay/** + -WorldPay applications/accounting/lib/worldpay: config Modified: ofbiz/branches/jquery/applications/accounting/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/build.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/build.xml (original) +++ ofbiz/branches/jquery/applications/accounting/build.xml Wed Oct 20 10:47:53 2010 @@ -48,6 +48,7 @@ under the License. <fileset dir="../marketing/build/lib" includes="*.jar"/> <fileset dir="../order/build/lib" includes="*.jar"/> <!-- <fileset dir="lib/cybersource" includes="*.jar"/> --> + <!-- <fileset dir="lib/securepay" includes="*.jar"/> --> <fileset dir="lib" includes="*.jar"/> </path> @@ -61,6 +62,7 @@ under the License. <exclude name="org/ofbiz/accounting/thirdparty/cybersource/**"/> <exclude name="org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java"/> <exclude name="org/ofbiz/accounting/thirdparty/orbital/**"/> + <exclude name="org/ofbiz/accounting/thirdparty/securepay/**"/> </patternset> </target> Modified: ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml Wed Oct 20 10:47:53 2010 @@ -14134,4 +14134,23 @@ <value xml:lang="en">Could not update credit card (write failure) : </value> <value xml:lang="it">Non è possibile aggiornare la carta di credito (fallimento in scrittura) : </value> </property> + <property key="PageTitleUpdatePaymentGatewayConfigSecurePay"> + <value xml:lang="en">Update Payment Gateway Config SecurePay</value> + <value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ SecurePay à¤à¤¨à¥à¤¨à¤¤ à¤à¤°à¥</value> + <value xml:lang="it">Aggiorna configurazione gateway pagamento SecurePay</value> + </property> + <property key="AccountingPayWithSecurePay"> + <value xml:lang="cs">Platba prostÅednictvÃm SecurePay</value> + <value xml:lang="de">Bezahlung mit SecurePay</value> + <value xml:lang="en">Pay With SecurePay</value> + <value xml:lang="es">Pagar con SecurePay</value> + <value xml:lang="fr">Paiement avec SecurePay</value> + <value xml:lang="it">Paga con SecurePay</value> + <value xml:lang="ja">Pay With SecurePay</value> + <value xml:lang="nl">Betaal met SecurePay</value> + <value xml:lang="pt_PT">Pagar Com SecurePay</value> + <value xml:lang="ro">Plateste cu SecurePay</value> + <value xml:lang="ru">ÐлаÑиÑÑ ÑеÑез SecurePay</value> + <value xml:lang="th">à¸à¸³à¸£à¸°à¹à¸à¸´à¸à¸à¹à¸²à¸ SecurePay</value> + </property> </resource> Modified: ofbiz/branches/jquery/applications/accounting/config/payment.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/config/payment.properties?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/config/payment.properties (original) +++ ofbiz/branches/jquery/applications/accounting/config/payment.properties Wed Oct 20 10:47:53 2010 @@ -383,3 +383,20 @@ payment.authorizedotnet.transdescription # payment.authorizedotnet.login=realaccountid # payment.authorizedotnet.password=realpassword # Note that you need a valid authorize.net account even for testing. + +############################################ +# Securepay Configuration +############################################ + +# Account information +payment.securepay.merchantID=[SecurePay MerchantID] +payment.securepay.pwd=[SecurePay Password] + +# Timeout of the payment processor +payment.securepay.processtimeout=80 + +# Server URL of the payment processor +payment.securepay.serverurl=https://api.securepay.com.au/xmlapi/payment + +#Enable rounds the currency amount to .00 (Y For test server / N for live server) +payment.securepay.enableamountround=N Modified: ofbiz/branches/jquery/applications/accounting/config/paymentTest.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/config/paymentTest.properties?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/config/paymentTest.properties (original) +++ ofbiz/branches/jquery/applications/accounting/config/paymentTest.properties Wed Oct 20 10:47:53 2010 @@ -48,3 +48,21 @@ payment.clearcommerce.enableCVM=N # currency code 826 is UK payment.clearcommerce.currencyCode=826 + +############################################ +# Securepay Test Configuration +############################################ + +# Account information +payment.securepay.merchantID=testuser +payment.securepay.pwd=xxxxxxx + +# Timeout of the payment processor +payment.securepay.processtimeout=80 + +# Server URL of the payment processor +payment.securepay.serverurl=https://test.securepay.com.au/xmlapi/payment + +#Enable rounds the currency amount to .00 (Y For test server / N for live server) +payment.securepay.enableamountround=Y + Modified: ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml Wed Oct 20 10:47:53 2010 @@ -737,6 +737,10 @@ under the License. <PaymentGatewayConfigType paymentGatewayConfigTypeId="ORBITAL" hasTable="N" description="Orbital Payment Gateway"/> <PaymentGatewayConfig paymentGatewayConfigId="ORBITAL_CONFIG" paymentGatewayConfigTypeId="ORBITAL" description="Orbital Config"/> <PaymentGatewayOrbital paymentGatewayConfigId="ORBITAL_CONFIG" username="ofbizuser" connectionPassword="ofbizpwd" merchantId="785240009879" engineClass="com.paymentech.orbital.sdk.engine.https.HttpsEngine" hostName="orbitalvar1.paymentech.net" port="443" hostNameFailover="orbitalvar2.paymentech.net" portFailover="443" connectionTimeoutSeconds="90" readTimeoutSeconds="90" authorizationURI="/authorize" sdkVersion="PaymentechSDK_6.3.0" sslSocketFactory="default" responseType="gateway"/> + + <PaymentGatewayConfigType paymentGatewayConfigTypeId="SECUREPAY" hasTable="N" description="SecurePay Payment Gateway"/> + <PaymentGatewayConfig paymentGatewayConfigId="SECUREPAY_CONFIG" paymentGatewayConfigTypeId="SECUREPAY" description="SecurePay Config"/> + <PaymentGatewaySecurePay paymentGatewayConfigId="SECUREPAY_CONFIG" merchantId="[SecurePay MerchantID]" pwd="[SecurePay Password]" serverURL="[SecurePay serverURL]" processTimeout="80" enableAmountRound="N"/> <!-- Credit Card methods by type --> <CustomMethodType customMethodTypeId="CC_AUTH" parentTypeId="" hasTable="N" description="Credit Card authorize methods"/> @@ -856,6 +860,12 @@ under the License. <CustomMethod customMethodId="PAYPAL_RELEASE_PFP" customMethodTypeId="PAYPAL_RELEASE" customMethodName="payflowPayPalVoid" description="Payflow PayPal Order release"/> <CustomMethod customMethodId="PAYPAL_RELEASE" customMethodTypeId="PAYPAL_RELEASE" customMethodName="payPalVoid" description="PayPal Order Release"/> + + <CustomMethod customMethodId="SECURE_AUTH_OFBIZ" customMethodTypeId="CC_AUTH" customMethodName="ofbScAuthorize" description="SecurePay payment authorize"/> + <CustomMethod customMethodId="SECURE_CAPTURE_OFBIZ" customMethodTypeId="CC_CAPTURE" customMethodName="ofbScCapture" description="SecurePay payment capture"/> + <CustomMethod customMethodId="SECURE_REFUND_OFBIZ" customMethodTypeId="CC_REFUND" customMethodName="ofbScRefund" description="SecurePay payment refund"/> + <CustomMethod customMethodId="SECURE_RELEASE_OFBIZ" customMethodTypeId="CC_RELEASE" customMethodName="ofbScRelease" description="SecurePay payment release"/> + <CustomMethod customMethodId="SECURE_CREDIT_OFBIZ" customMethodTypeId="CC_CREDIT" customMethodName="ofbScCCCredit" description="SecurePay Credit Card"/> <!-- Credit Cart Types --> <EnumerationType description="Credit Card Type" enumTypeId="CREDIT_CARD_TYPE" hasTable="N" parentTypeId=""/> Modified: ofbiz/branches/jquery/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/entitydef/entitymodel.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jquery/applications/accounting/entitydef/entitymodel.xml Wed Oct 20 10:47:53 2010 @@ -3410,6 +3410,20 @@ under the License. <key-map field-name="paymentGatewayConfigId"/> </relation> </entity> + <entity entity-name="PaymentGatewaySecurePay" + package-name="org.ofbiz.accounting.payment" + title="SecurePay Payment Gateway Config"> + <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="merchantId" type="value"><description>You merchant ID</description></field> + <field name="pwd" type="value" encrypt="true"><description>SecurePay Password of account information</description></field> + <field name="serverURL" type="value"><description>Server URL of the payment processor</description></field> + <field name="processTimeout" type="numeric"><description>Process Timeout</description></field> + <field name="enableAmountRound" type="indicator"><description>Enable rounds the currency amount to .00 (Y / N)</description></field> + <prim-key field="paymentGatewayConfigId"/> + <relation type="one" fk-name="PGSCP_PGC" rel-entity-name="PaymentGatewayConfig"> + <key-map field-name="paymentGatewayConfigId"/> + </relation> + </entity> <entity entity-name="PaymentGatewayRespMsg" package-name="org.ofbiz.accounting.payment" Modified: ofbiz/branches/jquery/applications/accounting/lib/README URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/lib/README?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/lib/README (original) +++ ofbiz/branches/jquery/applications/accounting/lib/README Wed Oct 20 10:47:53 2010 @@ -1,3 +1,3 @@ -To use the cybersource or worldpay libraries you can copy them to this directory. +To use the cybersource or worldpay or securepay libraries you can copy them to this directory. See the ofbiz/OPTIONAL_LIBRARIES file for more information. Modified: ofbiz/branches/jquery/applications/accounting/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/ofbiz-component.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/ofbiz-component.xml (original) +++ ofbiz/branches/jquery/applications/accounting/ofbiz-component.xml Wed Oct 20 10:47:53 2010 @@ -25,6 +25,7 @@ under the License. <classpath type="jar" location="build/lib/*"/> <classpath type="dir" location="config"/> <classpath type="jar" location="lib/*"/> + <classpath type="jar" location="lib/securepay/*"/> <classpath type="jar" location="lib/cybersource/*"/> <classpath type="jar" location="lib/worldpay/*"/> <classpath type="dir" location="lib/worldpay"/> @@ -78,6 +79,7 @@ under the License. <service-resource type="model" loader="main" location="servicedef/services_valuelink.xml"/> <service-resource type="model" loader="main" location="servicedef/services_verisign.xml"/> <service-resource type="model" loader="main" location="servicedef/services_orbital.xml"/> + <service-resource type="model" loader="main" location="servicedef/services_securepay.xml"/> <!-- Accounting Permission Services --> <service-resource type="model" loader="main" location="servicedef/services_perm.xml"/> Modified: ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml (original) +++ ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml Wed Oct 20 10:47:53 2010 @@ -73,4 +73,10 @@ under the License. <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <store-value value-field="lookedUpValue"/> </simple-method> + + <simple-method method-name="updatePaymentGatewayConfigSecurePay" short-description="Update Payment Gateway Config SecurePay"> + <entity-one entity-name="PaymentGatewaySecurePay" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> + </simple-method> </simple-methods> Modified: ofbiz/branches/jquery/applications/accounting/servicedef/services_paymentgateway.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/servicedef/services_paymentgateway.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/servicedef/services_paymentgateway.xml (original) +++ ofbiz/branches/jquery/applications/accounting/servicedef/services_paymentgateway.xml Wed Oct 20 10:47:53 2010 @@ -78,4 +78,10 @@ under the License. <auto-attributes entity-name="PaymentGatewayConfigType" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="PaymentGatewayConfigType" include="nonpk" mode="IN" optional="true"/> </service> + + <service name="updatePaymentGatewayConfigSecurePay" engine="simple" location="component://accounting/script/org/ofbiz/accounting/payment/PaymentGatewayConfigServices.xml" invoke="updatePaymentGatewayConfigSecurePay"> + <description>Update Payment Gateway Config SecurePay</description> + <auto-attributes entity-name="PaymentGatewaySecurePay" include="pk" mode="IN" optional="false"/> + <auto-attributes entity-name="PaymentGatewaySecurePay" include="nonpk" mode="IN" optional="true"/> + </service> </services> Modified: ofbiz/branches/jquery/applications/accounting/testdef/paymenttests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/testdef/paymenttests.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/testdef/paymenttests.xml (original) +++ ofbiz/branches/jquery/applications/accounting/testdef/paymenttests.xml Wed Oct 20 10:47:53 2010 @@ -26,4 +26,9 @@ <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml"/> </test-case> + <!-- enable when sandbox is available and configured --> + <!-- test-case case-name="cc-tests"> + <junit-test-suite class-name="org.ofbiz.accounting.thirdparty.securepay.SecurePayServiceTest"/> + </test-case--> + </test-suite> Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/controller.xml Wed Oct 20 10:47:53 2010 @@ -560,6 +560,13 @@ under the License. <response name="error" type="view" value="EditPaymentGatewayConfigType"/> </request-map> + <request-map uri="UpdatePaymentGatewayConfigSecurePay"> + <security https="true" auth="true"/> + <event type="service" invoke="updatePaymentGatewayConfigSecurePay"/> + <response name="success" type="view" value="EditPaymentGatewayConfig"/> + <response name="error" type="view" value="EditPaymentGatewayConfig"/> + </request-map> + <!-- TO BE REMOVED <request-map uri="TransactionReports"> <security https="true" auth="true"/> @@ -2886,3 +2893,4 @@ under the License. <!-- end of view mappings --> </site-conf> + Modified: ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml Wed Oct 20 10:47:53 2010 @@ -266,12 +266,11 @@ under the License. <section> <actions> <set field="tabButtonItem" value="finAccountMain"/> - <set field="parameters.portalPageId" value="FinAccountPortalPage"/> </actions> <widgets> <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> <decorator-section name="body"> - <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/> + <include-portal-page id="FinAccountPortalPage"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigForms.xml Wed Oct 20 10:47:53 2010 @@ -418,4 +418,12 @@ under the License. <submit button-type="button"/> </field> </form> + + <form name="EditPaymentGatewayConfigSecurePay" type="single" target="UpdatePaymentGatewayConfigSecurePay" default-map-name="paymentGatewaySecurePay" header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-entity entity-name="PaymentGatewaySecurePay" default-field-type="edit"/> + <field name="paymentGatewayConfigId"><hidden/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> + <submit button-type="button"/> + </field> + </form> </forms> Modified: ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigScreens.xml Wed Oct 20 10:47:53 2010 @@ -107,6 +107,9 @@ under the License. <entity-one entity-name="PaymentGatewayWorldPay" value-field="paymentGatewayWorldPay"> <field-map field-name="paymentGatewayConfigId" from-field="parameters.paymentGatewayConfigId"/> </entity-one> + <entity-one entity-name="PaymentGatewaySecurePay" value-field="paymentGatewaySecurePay"> + <field-map field-name="paymentGatewayConfigId" from-field="parameters.paymentGatewayConfigId"/> + </entity-one> </actions> <widgets> <decorator-screen name="GenericPaymentGatewayConfigDecorator"> @@ -195,6 +198,16 @@ under the License. </screenlet> </widgets> </section> + <section> + <condition> + <not><if-empty field="paymentGatewaySecurePay"/></not> + </condition> + <widgets> + <screenlet title="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigSecurePay}"> + <include-form name="EditPaymentGatewayConfigSecurePay" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> + </screenlet> + </widgets> + </section> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml Wed Oct 20 10:47:53 2010 @@ -42,7 +42,6 @@ under the License. <section> <actions> <set field="tabButtonItem" value="main"></set> - <set field="parameters.portalPageId" value="ApPortalPage"/> <set field="invoiceTypeId" value="PURCHASE_INVOICE"/> </actions> <widgets> @@ -54,7 +53,7 @@ under the License. <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/> </actions> <widgets> - <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/> + <include-portal-page id="ApPortalPage"/> </widgets> </section> </decorator-section> Modified: ofbiz/branches/jquery/applications/accounting/widget/ar/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ar/CommonScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ar/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ar/CommonScreens.xml Wed Oct 20 10:47:53 2010 @@ -44,7 +44,6 @@ under the License. <section> <actions> <set field="tabButtonItem" value="main"/> - <set field="parameters.portalPageId" value="ArPortalPage"/> <set field="invoiceTypeId" value="SALES_INVOICE"/> </actions> <widgets> @@ -56,7 +55,7 @@ under the License. <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/> </actions> <widgets> - <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/> + <include-portal-page id="ArPortalPage"/> </widgets> </section> </decorator-section> Modified: ofbiz/branches/jquery/applications/commonext/widget/SystemInfoForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/SystemInfoForms.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/SystemInfoForms.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/SystemInfoForms.xml Wed Oct 20 10:47:53 2010 @@ -29,11 +29,11 @@ under the License. <form name="EditSysInfoPortletParams" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml"> <field name="dummy" title="BLOCK the following notifications:"><display/></field> - <field name="allNotifications" entry-name="attributeMap.allNotifications"><check/></field> - <field name="email" entry-name="attributeMap.email"><check/></field> - <field name="internalNotes" entry-name="attributeMap.internalNotes"><check/></field> - <field name="telephoneForwards" entry-name="attributeMap.telephoneForwards"><check/></field> - <field name="taskAssignment" entry-name="attributeMap.taskAssignment"><check/></field> + <field name="allNotifications"><check/></field> + <field name="email"><check/></field> + <field name="internalNotes"><check/></field> + <field name="telephoneForwards"><check/></field> + <field name="taskAssignment"><check/></field> <field name="updateButton"><submit/></field> </form> Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/controller.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/controller.xml Wed Oct 20 10:47:53 2010 @@ -70,7 +70,7 @@ under the License. </request-map> <request-map uri="updateBlog"> <security https="true" auth="true"/> - <event type="service" invoke="createContent"/> + <event type="service" invoke="updateContent"/> <response name="success" type="view" value="blogMain"/> <response name="error" type="view" value="EditBlog"/> </request-map> Modified: ofbiz/branches/jquery/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/content/ContentScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/content/ContentScreens.xml Wed Oct 20 10:47:53 2010 @@ -184,9 +184,6 @@ under the License. </screen> <screen name="ShowContentPortlet"> <section> - <actions> - <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/> - </actions> <widgets> <content content-id="${contentId}"/> </widgets> Modified: ofbiz/branches/jquery/applications/humanres/widget/PersonTrainingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/PersonTrainingScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/PersonTrainingScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/PersonTrainingScreens.xml Wed Oct 20 10:47:53 2010 @@ -24,7 +24,6 @@ <section> <actions> <set field="titleProperty" value="PageTitleFindTrainingCalendar"/> - <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/> <set field="parameters.period" from-field="parameters.period" default-value="${initialView}"/> </actions> <widgets> Modified: ofbiz/branches/jquery/applications/marketing/widget/sfa/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/sfa/CommonScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/sfa/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/sfa/CommonScreens.xml Wed Oct 20 10:47:53 2010 @@ -61,7 +61,7 @@ under the License. <include-screen name="leftbar"/> </decorator-section> <decorator-section name="body"> - <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/> + <include-portal-page id="${parameters.portalPageId}"/> </decorator-section> </decorator-screen> </widgets> Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 20 10:47:53 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-1022407 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1024561 Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java Wed Oct 20 10:47:53 2010 @@ -1968,7 +1968,7 @@ public class OrderServices { return ServiceUtil.returnError((String)resp.get(ModelService.ERROR_MESSAGE)); } } - + // log an order note try { BigDecimal quantity = thisCancelQty.setScale(1, orderRounding); @@ -2430,11 +2430,7 @@ public class OrderServices { locale = Locale.getDefault(); } - ResourceBundleMapWrapper uiLabelMap = (ResourceBundleMapWrapper) UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); - uiLabelMap.addBottomResourceBundle("OrderUiLabels"); - uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - - Map bodyParameters = UtilMisc.toMap("orderId", orderId, "orderItemSeqId", orderItemSeqId, "userLogin", placingUserLogin, "uiLabelMap", uiLabelMap, "locale", locale); + Map bodyParameters = UtilMisc.toMap("orderId", orderId, "orderItemSeqId", orderItemSeqId, "userLogin", placingUserLogin, "locale", locale); if (placingParty!= null) { bodyParameters.put("partyId", placingParty.get("partyId")); } Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original) +++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Wed Oct 20 10:47:53 2010 @@ -551,7 +551,6 @@ public class ShoppingCartServices { if (UtilValidate.isNotEmpty(orderItems)) { int itemIndex = 0; for (GenericValue item : orderItems) { - List<GenericValue> orderItemAdjustments = orh.getOrderItemAdjustments(item); // set the item's ship group info List<GenericValue> shipGroupAssocs = orh.getOrderItemShipGroupAssocs(item); @@ -574,11 +573,16 @@ public class ShoppingCartServices { List<GenericValue> shipGroupItemAdjustments = EntityUtil.filterByAnd(orderItemAdjustments, UtilMisc.toMap("shipGroupSeqId", cartShipGroupIndexStr)); ShoppingCart.CartShipInfo csi = cart.getShipInfo(cartShipGroupIndex); - List itemTaxAdj = csi.getShipItemInfo(cart.findCartItem(itemIndex)).itemTaxAdj; - for(GenericValue shipGroupItemAdjustment : shipGroupItemAdjustments) { - if ("SALES_TAX".equals(shipGroupItemAdjustment.get("orderAdjustmentTypeId"))) { - itemTaxAdj.add(shipGroupItemAdjustment); - continue; + ShoppingCartItem cartItem = cart.findCartItem(itemIndex); + if (cartItem == null) { + Debug.logWarning("In loadCartFromOrder could not find cart item for itemIndex=" + itemIndex + ", for orderId=" + orderId, module); + } else { + List itemTaxAdj = csi.getShipItemInfo(cartItem).itemTaxAdj; + for(GenericValue shipGroupItemAdjustment : shipGroupItemAdjustments) { + if ("SALES_TAX".equals(shipGroupItemAdjustment.get("orderAdjustmentTypeId"))) { + itemTaxAdj.add(shipGroupItemAdjustment); + continue; + } } } } Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original) +++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Wed Oct 20 10:47:53 2010 @@ -1716,9 +1716,10 @@ public class ProductPromoWorker { amount = amount.setScale(decimals, rounding); GenericValue orderAdjustment = delegator.makeValue("OrderAdjustment", UtilMisc.toMap("orderAdjustmentTypeId", "PROMOTION_ADJUSTMENT", amountField, amount, - "productPromoId", productPromoAction.get("productPromoId"), - "productPromoRuleId", productPromoAction.get("productPromoRuleId"), - "productPromoActionSeqId", productPromoAction.get("productPromoActionSeqId"))); + "productPromoId", productPromoAction.get("productPromoId"), + "productPromoRuleId", productPromoAction.get("productPromoRuleId"), + "productPromoActionSeqId", productPromoAction.get("productPromoActionSeqId"), + "description", getProductPromoDescription((String) productPromoAction.get("productPromoId"), delegator))); // if an orderAdjustmentTypeId was included, override the default if (UtilValidate.isNotEmpty(productPromoAction.getString("orderAdjustmentTypeId"))) { @@ -1733,9 +1734,10 @@ public class ProductPromoWorker { amount = amount.setScale(decimals, rounding); GenericValue orderAdjustment = delegator.makeValue("OrderAdjustment", UtilMisc.toMap("orderAdjustmentTypeId", "PROMOTION_ADJUSTMENT", amountField, amount, - "productPromoId", productPromoAction.get("productPromoId"), - "productPromoRuleId", productPromoAction.get("productPromoRuleId"), - "productPromoActionSeqId", productPromoAction.get("productPromoActionSeqId"))); + "productPromoId", productPromoAction.get("productPromoId"), + "productPromoRuleId", productPromoAction.get("productPromoRuleId"), + "productPromoActionSeqId", productPromoAction.get("productPromoActionSeqId"), + "description", getProductPromoDescription((String) productPromoAction.get("productPromoId"), delegator))); // if an orderAdjustmentTypeId was included, override the default if (UtilValidate.isNotEmpty(productPromoAction.getString("orderAdjustmentTypeId"))) { @@ -1745,6 +1747,23 @@ public class ProductPromoWorker { cart.addAdjustment(orderAdjustment); } + private static String getProductPromoDescription(String prodPromoId, Delegator delegator) { + // get the promoText / promoName to set as a descr of the orderAdj + GenericValue prodPromo; + try { + prodPromo = delegator.findByPrimaryKeyCache("ProductPromo", UtilMisc.toMap("productPromoId", prodPromoId)); + if (UtilValidate.isNotEmpty(prodPromo.get("promoText"))) { + return (String) prodPromo.get("promoText"); + } + return (String) prodPromo.get("promoName"); + + } catch (GenericEntityException e) { + Debug.logWarning("Error getting ProductPromo for Id " + prodPromoId, module); + } + + return null; + } + protected static Integer findAdjustment(GenericValue productPromoAction, List adjustments) { for (int i = 0; i < adjustments.size(); i++) { GenericValue checkOrderAdjustment = (GenericValue) adjustments.get(i); Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestForms.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestForms.xml Wed Oct 20 10:47:53 2010 @@ -633,14 +633,14 @@ under the License. </field> </form> <form name="EditCustReqStatusId" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml"> - <field name="statusGroup" entry-name="attributeMap.statusGroup"> + <field name="statusGroup"> <drop-down> <option key="OPEN" description="Open"/> <option key="COMPLETED" description="Completed"/> <option key="CANCELLED" description="Cancelled"/> </drop-down> </field> - <field name="otherContacts" entry-name="attributeMap.otherContacts"><drop-down allow-empty="false"><option key="Y" description="Yes"/><option key="N" description="No"/></drop-down></field> + <field name="otherContacts"><drop-down allow-empty="false"><option key="Y" description="Yes"/><option key="N" description="No"/></drop-down></field> <field name="saveButton"><submit/></field> </form> <form name="ListCustRequests" type="list" list-name="custRequests" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target="updaterequest"> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml Wed Oct 20 10:47:53 2010 @@ -522,7 +522,6 @@ under the License. <section> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/> <set field="fromPartyId" from-field="userLogin.partyId"/> </actions> <widgets> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderForms.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderForms.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderForms.xml Wed Oct 20 10:47:53 2010 @@ -176,7 +176,7 @@ under the License. <!-- Forms Specific to portlet --> <form name="EditOrderByCustomer" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml"> - <field name="statusId" entry-name="attributeMap.statusId"> + <field name="statusId"> <drop-down> <option key="ORDER_CREATED" description="${uiLabelMap.CommonCreated}"/> <option key="ORDER_PROCESSING" description="${uiLabelMap.CommonProcessing}"/> @@ -188,7 +188,7 @@ under the License. <option key="ORDER_CANDELLED" description="${uiLabelMap.CommonCancelled}"/> </drop-down> </field> - <field name="roleTypeId" entry-name="attributeMap.roleTypeId"> + <field name="roleTypeId"> <drop-down> <option key="PLACING_CUSTOMER" description="${uiLabelMap.MyPortalPlacingCustomer}"/> <option key="SHIP_TO_CUSTOMER" description="${uiLabelMap.MyPortalShipToCustomer}"/> 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=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml Wed Oct 20 10:47:53 2010 @@ -37,12 +37,11 @@ under the License. <section> <actions> <set field="headerItem" value="main"/> - <set field="parameters.portalPageId" value="OrderPortalPage"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/> + <include-portal-page id="OrderPortalPage"/> </decorator-section> </decorator-screen> </widgets> @@ -491,7 +490,6 @@ under the License. <set field="statusId" from-field="statusId"/> <set field="roleTypeId" from-field="roleTypeId"/> <set field="screenletTitle" from-field="uiLabelMap.MyPortalMyOrders"/> - <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/> </actions> <widgets> <screenlet title="${screenletTitle} ${partyId} ${statusId}" navigation-form-name="ListCustomerOrders" > @@ -531,7 +529,6 @@ under the License. <actions> <set field="partyId" from-field="userLogin.partyId"/> <set field="roleTypeId" value="SUPPLIER_AGENT"/> - <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/> </actions> <widgets> <section> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportScreens.xml Wed Oct 20 10:47:53 2010 @@ -24,16 +24,13 @@ under the License. <screen name="OrderPurchaseReportOptions"> <section> <actions> - <set field="titleProperty" value="OrderReports"/> <set field="headerItem" value="reports"/> - - <set field="parameters.portalPageId" value="OrderReportPage"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/> + <include-portal-page id="OrderReportPage"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original) +++ ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Wed Oct 20 10:47:53 2010 @@ -36,28 +36,28 @@ under the License. </simple-method> <simple-method method-name="updateContactMech" short-description="Update Contact Mechanism"> - <if-compare field="contactMechTypeId" operator="equals" value="POSTAL_ADDRESS"> + <if-compare field="parameters.contactMechTypeId" operator="equals" value="POSTAL_ADDRESS"> <add-error><fail-property resource="PartyUiLabels" property="PartyServiceNotForPostalAddress"/></add-error> </if-compare> - <if-compare field="contactMechTypeId" operator="equals" value="TELECOM_NUMBER"> + <if-compare field="parameters.contactMechTypeId" operator="equals" value="TELECOM_NUMBER"> <add-error><fail-property resource="PartyUiLabels" property="PartyServiceNotForTelecomNumber"/></add-error> </if-compare> <check-errors/> <set field="successMessageProperty" value="PartyContactMechanismSuccessfullyUpdated"/> - <if-compare field="context.contactMechTypeId" operator="equals" value="EMAIL_ADDRESS"> + <if-compare field="parameters.contactMechTypeId" operator="equals" value="EMAIL_ADDRESS"> <set field="successMessageProperty" value="PartyEmailAddressSuccessfullyUpdated"/> </if-compare> - <if-compare field="context.contactMechTypeId" operator="equals" value="WEB_ADDRESS"> + <if-compare field="parameters.contactMechTypeId" operator="equals" value="WEB_ADDRESS"> <set field="successMessageProperty" value="PartyWebAddressSuccessfullyUpdated"/> </if-compare> - <if-compare field="context.contactMechTypeId" operator="equals" value="IP_ADDRESS"> + <if-compare field="parameters.contactMechTypeId" operator="equals" value="IP_ADDRESS"> <set field="successMessageProperty" value="PartyIpAddressSuccessfullyUpdated"/> </if-compare> - <if-compare field="context.contactMechTypeId" operator="equals" value="ELECTRONIC_ADDRESS"> + <if-compare field="parameters.contactMechTypeId" operator="equals" value="ELECTRONIC_ADDRESS"> <set field="successMessageProperty" value="PartyElectronicAddressSuccessfullyUpdated"/> </if-compare> - <if-compare field="context.contactMechTypeId" operator="equals" value="DOMAIN_NAME"> + <if-compare field="parameters.contactMechTypeId" operator="equals" value="DOMAIN_NAME"> <set field="successMessageProperty" value="PartyDomainNameSuccessfullyUpdated"/> </if-compare> Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 20 10:47:53 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-1022407 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1024561 Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml Wed Oct 20 10:47:53 2010 @@ -981,10 +981,10 @@ under the License. </field> </form> <form name="EditCommPortletParams" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml"> - <field name="communicationPartyId" entry-name="attributeMap.communicationPartyId"> + <field name="communicationPartyId"> <lookup target-form-name="LookupPartyName" default-value="${userLogin.partyId}"/> </field> - <field name="internalNotesOnly" entry-name="attributeMap.internalNotesOnly"> + <field name="internalNotesOnly"> <drop-down> <option key="false" description="${uiLabelMap.CommonFalse}"/> <option key="true" description="${uiLabelMap.CommonTrue}"/> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventScreens.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventScreens.xml Wed Oct 20 10:47:53 2010 @@ -839,7 +839,6 @@ under the License. <section> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/> <set field="internalNotesOnly" from-field="internalNotesOnly" default-value="false"/> <set field="partyId" from-field="communicationPartyId" default-value="${userLogin.partyId}"/> <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml Wed Oct 20 10:47:53 2010 @@ -59,7 +59,6 @@ under the License. <screen name="viewprofile"> <section> <actions> - <set field="parameters.portalPageId" value="PartyProfile"/> <set field="titleProperty" value="PageTitleViewPartyProfile"/> <set field="tabButtonItem" value="viewprofile"/> <set field="labelTitleProperty" value="PartyTaxAuthInfos"/> @@ -131,7 +130,7 @@ under the License. </section> <section> <widgets> - <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/> + <include-portal-page id="PartyProfile"/> </widgets> </section> </widgets> Modified: ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml Wed Oct 20 10:47:53 2010 @@ -6010,7 +6010,7 @@ <value xml:lang="de">Abonnemente suchen</value> <value xml:lang="en">Find Subscription</value> <value xml:lang="es">Buscar suscripción</value> - <value xml:lang="fr">Recherche d'un abonnements</value> + <value xml:lang="fr">Recherche d'un abonnement</value> <value xml:lang="it">Ricerca Abbonamenti</value> <value xml:lang="ro">Cauta Abonamente</value> <value xml:lang="ru">ÐайÑи подпиÑкÑ</value> Modified: ofbiz/branches/jquery/applications/product/data/ProductPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/data/ProductPortletData.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/data/ProductPortletData.xml (original) +++ ofbiz/branches/jquery/applications/product/data/ProductPortletData.xml Wed Oct 20 10:47:53 2010 @@ -30,17 +30,9 @@ <PortletCategory portletCategoryId="PRODUCTSTORE" description="ProductStore Management"/> <PortalPortlet portalPortletId="PrdStoreFacilityMgmt" portletName="Facility associated to ProductStore management" - screenName="GenericScreenletAjaxWithMenu" - screenLocation="component://common/widget/PortalPageScreens.xml" - description="Facilities associated for one productStore list and management : associate a facility, edit associate data, remove association" - securityServiceName="" securityMainAction="VIEW"/> - <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="titleLabel" attrValue="ProductStoreFacilityAssocList" portalPageId="_NA_" portletSeqId="00000"/> - <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="divIdRefresh" attrValue="PrdStoreFacilityMgmt_refresh" portalPageId="_NA_" portletSeqId="00000"/> - <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="divIdArea" attrValue="PrdStoreFacilityMgmtArea" portalPageId="_NA_" portletSeqId="00000"/> - <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="screenName" attrValue="ListProductStoreFacility" portalPageId="_NA_" portletSeqId="00000"/> - <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="screenLocation" attrValue="component://product/widget/catalog/StoreScreens.xml" portalPageId="_NA_" portletSeqId="00000"/> - <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="menuName" attrValue="ProductStoreFacility" portalPageId="_NA_" portletSeqId="00000"/> - <PortletAttribute portalPortletId="PrdStoreFacilityMgmt" attrName="menuLocation" attrValue="component://product/widget/catalog/CatalogMenus.xml" portalPageId="_NA_" portletSeqId="00000"/> + screenName="ListProductStoreFacility" + screenLocation="component://product/widget/catalog/StoreScreens.xml" + description="List of best selling products of the day"/> <PortletPortletCategory portalPortletId="PrdStoreFacilityMgmt" portletCategoryId="PRODUCTSTORE"/> <PortalPage portalPageId="ProductStoreFacility" sequenceNum="100" portalPageName="ProductStore Facility Management" description="The page to manage productStoreFacility data" ownerUserLoginId="_NA_" /> Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original) +++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Wed Oct 20 10:47:53 2010 @@ -83,8 +83,7 @@ under the License. <set-service-fields service-name="updateContactMech" map="parameters" to-map="updateContactMechMap"/> <set field="updateContactMechMap.contactMechTypeId" from-field="parameters.contactMechTypeId"/> <call-service service-name="updateContactMech" in-map-name="updateContactMechMap"> - <default-message>Contact Mechanism successfully updated.</default-message> - + <default-message property="PartyContactMechanismSuccessfullyUpdated" resource="PartyUiLabels"/> <result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId"/> </call-service> <else> Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 20 10:47:53 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-1022407 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1024561 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=1025485&r1=1025484&r2=1025485&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 Wed Oct 20 10:47:53 2010 @@ -264,7 +264,7 @@ public class ShipmentServices { if (estimates == null || estimates.size() < 1) { if (initialEstimateAmt.compareTo(BigDecimal.ZERO) == 0) { Debug.logWarning("Using the passed context : " + context, module); - Debug.logWarning("No shipping estimates found; the shipping amount returned is 0!", module); + Debug.logWarning("No shipping estimates found; the shipping amount returned is 0! Condition used was: " + estFieldsCond, module); } Map<String, Object> respNow = ServiceUtil.returnSuccess(); Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml Wed Oct 20 10:47:53 2010 @@ -2308,6 +2308,10 @@ under the License. <request-map uri="ProductStoreFacilities"><security https="true" auth="true"/> <response name="success" type="view" value="ProductStoreFacilities"/> </request-map> + <request-map uri="ListProductStoreFacilityFormOnly"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ListProductStoreFacilityFormOnly"/> + </request-map> <request-map uri="editProductStoreFacility"><security https="true" auth="true"/> <response name="success" type="view" value="EditProductStoreFacility"/> </request-map> @@ -2326,8 +2330,8 @@ under the License. <request-map uri="deleteProductStoreFacility"> <security https="true" auth="true"/> <event type="service" invoke="deleteProductStoreFacility"/> - <response name="success" type="view" value="ListProductStoreFacility"/> - <response name="error" type="view" value="ListProductStoreFacility"/> + <response name="success" type="view" value="ListProductStoreFacilityFormOnly"/> + <response name="error" type="view" value="ListProductStoreFacilityFormOnly"/> </request-map> <!-- ================ Keyword Thesaurus Requests ================= --> @@ -2846,6 +2850,7 @@ under the License. <view-map name="EditProductStoreVendorShipments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorShipments"/> <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/StoreScreens.xml#ProductStoreFacilities" type="screen"/> <view-map name="ListProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacility" type="screen"/> + <view-map name="ListProductStoreFacilityFormOnly" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacilityFormOnly" type="screen"/> <view-map name="EditProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFacility" type="screen"/> <view-map name="EditVendorProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditVendorProduct"/> <view-map name="EditKeywordThesaurus" type="screen" page="component://product/widget/catalog/ThesaurusScreens.xml#EditKeywordThesaurus"/> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml Wed Oct 20 10:47:53 2010 @@ -48,28 +48,6 @@ under the License. </section> </screen> - <screen name="uiLabelDecorator"> - <section> - <condition> - <if-has-permission permission="CATALOG" action="_VIEW" /> - </condition> - <actions> - <!-- base/top/specific map first, then more common map added for shared labels --> - <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - </actions> - <widgets> - <decorator-section-include name="body"/> - </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> - </fail-widgets> - </section> - </screen> - <screen name="CommonProductDecorator"> <section> <actions> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/StoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/StoreForms.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/StoreForms.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/StoreForms.xml Wed Oct 20 10:47:53 2010 @@ -118,7 +118,7 @@ under the License. <field name="productStoreId"><hidden /></field> <field name="facilityId"> <display-entity entity-name="Facility" description="${facilityName}"> - <sub-hyperlink link-style="link" description="[${facilityId}]" target="EditFacility"> + <sub-hyperlink link-style="link" description="[${facilityId}]" target="/facility/control/EditFacility" target-type="inter-app"> <parameter param-name="facilityId"/> </sub-hyperlink> </display-entity> @@ -151,6 +151,6 @@ under the License. <field name="submitButton" title="${groovy: productStoreFacility == null ? uiLabelMap.CommonAdd : uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> <submit button-type="button"/> </field> - <on-event-update-area event-type="submit" area-id="PrdStoreFacilityMgmt_refresh" area-target="refreshPortlet?portalPortletId=PrdStoreFacilityMgmt&productStoreId=${parameters.productStoreId}"/> + <on-event-update-area event-type="submit" area-id="PrdStoreFacilityMgmtArea" area-target="ListProductStoreFacilityFormOnly?portalPortletId=PrdStoreFacilityMgmt&productStoreId=${parameters.productStoreId}"/> </form> </forms> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml Wed Oct 20 10:47:53 2010 @@ -581,41 +581,54 @@ under the License. <set field="headerItem" value="store"/> <set field="tabButtonItem" value="EditProductStoreFacilities"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <set field="portalPageId" value="ProductStoreFacility"/> </actions> <widgets> <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/> + <include-portal-page id="ProductStoreFacility"/> </decorator-section> </decorator-screen> </widgets> </section> </screen> <screen name="ListProductStoreFacility"> - <section> - <widgets> - <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <container id="ProductStoreFacilityEditArea"/> - <include-form name="ListProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> + <section> + <widgets> + <screenlet title="${uiLabelMap.ProductStoreFacilityAssocList}" navigation-menu-name="ProductStoreFacility"> + <include-menu name="ProductStoreFacility" location="component://product/widget/catalog/CatalogMenus.xml"/> + <container id="PrdStoreFacilityMgmtArea"> + <decorator-section name="body"> + <include-screen name="ListProductStoreFacilityFormOnly"/> + </decorator-section> + </container> + </screenlet> + </widgets> + </section> + </screen> + <screen name="ListProductStoreFacilityFormOnly"> + <section> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + </actions> + <widgets> + <container id="ProductStoreFacilityEditArea"/> + <include-form name="ListProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/> + </widgets> + </section> </screen> <screen name="EditProductStoreFacility"> <section> - <condition><if-has-permission permission="CATALOG" action="_ADMIN"/></condition> + <condition> + <if-has-permission permission="CATALOG" action="_ADMIN"/> + </condition> <actions> <entity-one entity-name="ProductStoreFacility" value-field="productStoreFacility"/> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> - <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-form name="EditProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/> - </decorator-section> - </decorator-screen> + <include-form name="EditProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.ProductCatalogUpdatePermissionError}</label> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/SubscriptionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/SubscriptionForms.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/SubscriptionForms.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/SubscriptionForms.xml Wed Oct 20 10:47:53 2010 @@ -62,6 +62,12 @@ under the License. <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> <field name="productId"><lookup target-form-name="LookupProduct"/></field> <field name="productCategoryId"><lookup target-form-name="LookupProductCategory"/></field> + <field name="automaticExtend"> + <drop-down allow-empty="true"> + <option key="Y" description="${uiLabelMap.CommonYes}"/> + <option key="N" description="${uiLabelMap.CommonNo}"/> + </drop-down> + </field> <field name="roleTypeId"><ignored/></field> <field name="canclAutmExtTimeUomId"><ignored/></field> Modified: ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Wed Oct 20 10:47:53 2010 @@ -370,7 +370,7 @@ under the License. <to-string field="context.contactMechId"/> <log level="info" message="Calling generic updateContactMech method"/> <call-service service-name="updateContactMech" in-map-name="context"> - <default-message>Contact Mechanism successfully updated.</default-message> + <default-message property="PartyContactMechanismSuccessfullyUpdated" resource="PartyUiLabels"/> <result-to-field result-name="contactMechId" field="newWorkEffortContactMech.contactMechId"/> </call-service> <else> Modified: ofbiz/branches/jquery/applications/workeffort/widget/CalendarForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/CalendarForms.xml?rev=1025485&r1=1025484&r2=1025485&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/CalendarForms.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/CalendarForms.xml Wed Oct 20 10:47:53 2010 @@ -58,7 +58,7 @@ under the License. </form> <!-- Forms Specific to portlet --> <form name="EditCalendar" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml"> - <field name="initialView" entry-name="attributeMap.initialView"> + <field name="initialView"> <drop-down> <option key="day" description="${uiLabelMap.WorkEffortDayView}"/> <option key="week" description="${uiLabelMap.WorkEffortWeekView}"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |