svn commit: r1861816 - in /ofbiz/ofbiz-framework/branche
Locked
 
|
Author: surajk
Date: Sat Jun 22 05:56:59 2019 New Revision: 1861816 URL: http://svn.apache.org/viewvc?rev=1861816&view=rev Log: Applied fix from trunk for revision: 1861815 === Fixed: AutoDescription of promotion showing invalid text. (OFBIZ-10853) Modified code as per latest changes of inputParamEnumId and customMethodId. Thanks Lalit Dashora for reporting the issue and providing the patch. Modified: ofbiz/ofbiz-framework/branches/release18.12/ (props changed) ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/ofbiz-framework/branches/release18.12/applications/product/config/ProductPromoUiLabels.xml Propchange: ofbiz/ofbiz-framework/branches/release18.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 22 05:56:59 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141, 1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811 +/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141, 1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815 Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1861816&r1=1861815&r2=1861816&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original) +++ ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Sat Jun 22 05:56:59 2019 @@ -690,7 +690,7 @@ public final class ProductPromoWorker { Map<String, Object> messageContext = UtilMisc.<String, Object>toMap("condValue", condValue, "equalityOperator", equalityOperator, "quantityOperator", quantityOperator); - if ("PPIP_PARTY_CLASS".equalsIgnoreCase(productPromoCond.getString("inputParamEnumId"))) { + if ("PPIP_PARTY_CLASS".equalsIgnoreCase(productPromoCond.getString("inputParamEnumId")) || "PPC_PARTY_CLASS".equalsIgnoreCase(productPromoCond.getString("customMethodId"))) { GenericValue partyClassificationGroup = EntityQuery.use(delegator).from("PartyClassificationGroup").where("partyClassificationGroupId", condValue).cache(true).queryOne(); if (partyClassificationGroup != null && UtilValidate.isNotEmpty(partyClassificationGroup.getString("description"))) { condValue = partyClassificationGroup.getString("description"); @@ -703,7 +703,20 @@ public final class ProductPromoWorker { partyClassificationsExcluded.add(condValue); } } else { - String msgProp = UtilProperties.getMessage("ProductPromoUiLabels", "ProductPromoCondition." + productPromoCond.getString("inputParamEnumId"), messageContext, locale); + String enumId = null; + if (UtilValidate.isNotEmpty(productPromoCond.getString("customMethodId"))) { + GenericValue enumeration = EntityQuery.use(delegator).from("Enumeration").where("enumCode", productPromoCond.getString("customMethodId")).cache().queryFirst(); + if (enumeration != null) { + enumId = enumeration.getString("enumId"); + } + } else { + enumId = productPromoCond.getString("inputParamEnumId"); + } + + if (UtilValidate.isNotEmpty(productPromoCond.getString("otherValue"))) { + messageContext.put("otherValue", productPromoCond.getString("otherValue")); + } + String msgProp = UtilProperties.getMessage("ProductPromoUiLabels", "ProductPromoCondition." + enumId, messageContext, locale); promoDescBuf.append(msgProp); promoDescBuf.append(" "); @@ -733,7 +746,17 @@ public final class ProductPromoWorker { messageContext.put("productName", ProductContentWrapper.getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher, "html")); } - String msgProp = UtilProperties.getMessage("ProductPromoUiLabels", "ProductPromoAction." + productPromoAction.getString("productPromoActionEnumId"), messageContext, locale); + String enumId = null; + if (UtilValidate.isNotEmpty(productPromoAction.getString("customMethodId"))) { + GenericValue enumeration = EntityQuery.use(delegator).from("Enumeration").where("enumCode", productPromoAction.getString("customMethodId")).cache().queryFirst(); + if (enumeration != null) { + enumId = enumeration.getString("enumId"); + } + } else { + enumId = productPromoAction.getString("productPromoActionEnumId"); + } + + String msgProp = UtilProperties.getMessage("ProductPromoUiLabels", "ProductPromoAction." + enumId, messageContext, locale); promoDescBuf.append(msgProp); promoDescBuf.append(" "); Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/product/config/ProductPromoUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/product/config/ProductPromoUiLabels.xml?rev=1861816&r1=1861815&r2=1861816&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/applications/product/config/ProductPromoUiLabels.xml (original) +++ ofbiz/ofbiz-framework/branches/release18.12/applications/product/config/ProductPromoUiLabels.xml Sat Jun 22 05:56:59 2019 @@ -76,6 +76,9 @@ <value xml:lang="zh">大äºçäº</value> <value xml:lang="zh-TW">大äºçäº</value> </property> + <property key="ProductPromoCondition.PPIP_ORST_HIST"> + <value xml:lang="en">spend ${quantityOperator} ${condValue} in any ${otherValue}</value> + </property> <property key="ProductPromoCondition.PPIP_ORDER_TOTAL"> <value xml:lang="en">spend ${quantityOperator} ${condValue}</value> <value xml:lang="zh">è±è´¹ ${quantityOperator} ${condValue}</value> @@ -92,6 +95,9 @@ <value xml:lang="zh">è´ä¹° ${quantityOperator} ${condValue} çåæ ¼äº§å</value> <value xml:lang="zh-TW">購買 ${quantityOperator} ${condValue} çåæ ¼ç¢å</value> </property> + <property key="ProductPromoCondition.PPIP_GEO_ID"> + <value xml:lang="en">With shipping destination ${condValue}</value> + </property> <property key="ProductPromoCondition.PPIP_PRODUCT_AMOUNT"> <value xml:lang="en">for each ${condValue} or more of qualifying products</value> <value xml:lang="zh">对äºæ¯ä¸ª ${condValue} ææ´å¤çåæ ¼äº§å</value> @@ -157,4 +163,7 @@ <value xml:lang="zh">å¾å° ${amount} ä»ä½ ç订åæ£é¤</value> <value xml:lang="zh-TW">å¾å° ${amount} å¾ä½ çè¨å®æ£é¤</value> </property> + <property key="ProductPromoAction.PROMO_SHIP_CHARGE"> + <value xml:lang="en">Get ${amount}% discount on shipping</value> + </property> </resource> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |