buildbot success in on ofbiz-trunk-framework
The Buildbot has detected a restored build on builder ofbiz-trunk-framework while building . Full details are available at: https://ci.apache.org/builders/ofbiz-trunk-framework/builds/938 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-ofbiz-framework-commit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1818847 Blamelist: mbrohl Build succeeded! Sincerely, -The Buildbot
svn commit: r1818848 - /ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java
Author: mbrohl
Date: Wed Dec 20 20:10:15 2017
New Revision: 1818848
URL: http://svn.apache.org/viewvc?rev=1818848=rev
Log:
Improved: Logging: change System.out/.err/.. println to Debug.log...
in PdfSurveyServices.java.
(OFBIZ-10046)
Thanks Kyra Pritzel-Hentley for reporting and providing the patch.
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java?rev=1818848=1818847=1818848=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java
Wed Dec 20 20:10:15 2017
@@ -298,7 +298,7 @@ public class PdfSurveyServices {
}
} catch (DocumentException | GeneralException | IOException e) {
-System.err.println(e.getMessage());
+Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
}
@@ -348,7 +348,7 @@ public class PdfSurveyServices {
ByteBuffer outByteBuffer = ByteBuffer.wrap(baos.toByteArray());
results.put("outByteBuffer", outByteBuffer);
} catch (DocumentException | IOException | GeneralException e) {
-System.err.println(e.getMessage());
+Debug.logError(e, module);
results = ServiceUtil.returnError(e.getMessage());
}
return results;
@@ -414,7 +414,7 @@ public class PdfSurveyServices {
ByteBuffer outByteBuffer = ByteBuffer.wrap(baos.toByteArray());
results.put("outByteBuffer", outByteBuffer);
} catch (GenericEntityException | DocumentException e) {
-System.err.println(e.getMessage());
+Debug.logError(e, module);
results = ServiceUtil.returnError(e.getMessage());
}
@@ -439,7 +439,7 @@ public class PdfSurveyServices {
}
results.put("questionsAndAnswers", qAndA);
} catch (GenericEntityException e) {
-System.err.println(e.getMessage());
+Debug.logError(e, module);
results = ServiceUtil.returnError(e.getMessage());
}
@@ -505,7 +505,7 @@ public class PdfSurveyServices {
acroFieldMap.put(fieldName, value);
}
} catch (GenericEntityException e) {
-System.err.println(e.getMessage());
+Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
}
svn commit: r1818847 - /ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
Author: mbrohl
Date: Wed Dec 20 20:04:36 2017
New Revision: 1818847
URL: http://svn.apache.org/viewvc?rev=1818847=rev
Log:
Improved: Refactor magic numbers in
org.apache.ofbiz.accounting.thirdparty.clearcommerce.CCPaymentServices.
(OFBIZ-10100)
Thanks Julian Leichert for reporting and providing the patch.
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java?rev=1818847=1818846=1818847=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
Wed Dec 20 20:04:36 2017
@@ -56,6 +56,7 @@ public class CCPaymentServices {
private static int decimals =
UtilNumber.getBigDecimalScale("invoice.decimals");
private static int rounding =
UtilNumber.getBigDecimalRoundingMode("invoice.rounding");
public final static String resource = "AccountingUiLabels";
+private final static int maxSevComp = 4;
public static Map ccAuth(DispatchContext dctx, Map context) {
String ccAction = (String) context.get("ccAction");
@@ -73,7 +74,7 @@ public class CCPaymentServices {
return ServiceUtil.returnError(cce.getMessage());
}
-if (getMessageListMaxSev(authResponseDoc) > 4) { // 5 and higher,
process error from HSBC
+if (getMessageListMaxSev(authResponseDoc) > maxSevComp) { // 5 and
higher, process error from HSBC
Map result = ServiceUtil.returnSuccess();
result.put("authResult", Boolean.FALSE);
result.put("processAmount", BigDecimal.ZERO);
@@ -104,7 +105,7 @@ public class CCPaymentServices {
return ServiceUtil.returnError(cce.getMessage());
}
-if (getMessageListMaxSev(creditResponseDoc) > 4) {
+if (getMessageListMaxSev(creditResponseDoc) > maxSevComp) {
Map result = ServiceUtil.returnSuccess();
result.put("creditResult", Boolean.FALSE);
result.put("creditAmount", BigDecimal.ZERO);
@@ -139,7 +140,7 @@ public class CCPaymentServices {
return ServiceUtil.returnError(cce.getMessage());
}
-if (getMessageListMaxSev(captureResponseDoc) > 4) {
+if (getMessageListMaxSev(captureResponseDoc) > maxSevComp) {
Map result = ServiceUtil.returnSuccess();
result.put("captureResult", Boolean.FALSE);
result.put("captureAmount", BigDecimal.ZERO);
@@ -174,7 +175,7 @@ public class CCPaymentServices {
return ServiceUtil.returnError(cce.getMessage());
}
-if (getMessageListMaxSev(releaseResponseDoc) > 4) {
+if (getMessageListMaxSev(releaseResponseDoc) > maxSevComp) {
Map result = ServiceUtil.returnSuccess();
result.put("releaseResult", Boolean.FALSE);
result.put("releaseAmount", BigDecimal.ZERO);
@@ -231,7 +232,7 @@ public class CCPaymentServices {
return ServiceUtil.returnError(cce.getMessage());
}
-if (getMessageListMaxSev(refundResponseDoc) > 4) {
+if (getMessageListMaxSev(refundResponseDoc) > maxSevComp) {
Map result = ServiceUtil.returnSuccess();
result.put("refundResult", Boolean.FALSE);
result.put("refundAmount", BigDecimal.ZERO);
@@ -266,7 +267,7 @@ public class CCPaymentServices {
return ServiceUtil.returnError(cce.getMessage());
}
-if (getMessageListMaxSev(reauthResponseDoc) > 4) {
+if (getMessageListMaxSev(reauthResponseDoc) > maxSevComp) {
Map result = ServiceUtil.returnSuccess();
result.put("reauthResult", Boolean.FALSE);
result.put("reauthAmount", BigDecimal.ZERO);
@@ -932,7 +933,7 @@ public class CCPaymentServices {
if (Debug.verboseOn()) {
Debug.logVerbose("Result severity from clearCommerce:" +
getMessageListMaxSev(responseDocument), module);
}
-if (Debug.verboseOn() && getMessageListMaxSev(responseDocument) > 4) {
+if (Debug.verboseOn() && getMessageListMaxSev(responseDocument) >
maxSevComp) {
Debug.logVerbose("Returned messages:" +
getMessageList(responseDocument), module);
}
svn commit: r1818846 [1/3] - /ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/
Author: mbrohl
Date: Wed Dec 20 19:56:26 2017
New Revision: 1818846
URL: http://svn.apache.org/viewvc?rev=1818846=rev
Log:
Improved: General refactoring and code improvements, package
org.apache.ofbiz.order.order.
(OFBIZ-10101)
Thanks Julian Leichert for reporting and providing the patches.
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderListState.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderLookupServices.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java?rev=1818846=1818845=1818846=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java
Wed Dec 20 19:56:26 2017
@@ -107,9 +107,6 @@ public final class OrderChangeHelper {
OrderChangeHelper.createReceivedPayments(dispatcher, userLogin,
orderId);
OrderChangeHelper.createOrderInvoice(dispatcher, userLogin,
orderId);
OrderChangeHelper.orderStatusChanges(dispatcher, userLogin,
orderId, "ORDER_COMPLETED", "ITEM_APPROVED", "ITEM_COMPLETED", null);
-} catch (GenericEntityException e) {
-Debug.logError(e, module);
-return false;
} catch (GenericServiceException e) {
Debug.logError(e, module);
return false;
@@ -235,7 +232,7 @@ public final class OrderChangeHelper {
}
}
-public static void createReceivedPayments(LocalDispatcher dispatcher,
GenericValue userLogin, String orderId) throws GenericEntityException,
GenericServiceException {
+public static void createReceivedPayments(LocalDispatcher dispatcher,
GenericValue userLogin, String orderId) throws GenericServiceException {
GenericValue orderHeader = null;
try {
orderHeader = dispatcher.getDelegator().findOne("OrderHeader",
UtilMisc.toMap("orderId", orderId), false);
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java?rev=1818846=1818845=1818846=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java
Wed Dec 20 19:56:26 2017
@@ -112,10 +112,7 @@ public class OrderContentWrapper impleme
orderContentCache.put(cacheKey, outString);
return outString;
-} catch (GeneralException e) {
-Debug.logError(e, "Error rendering OrderContent, inserting empty
String", module);
-return "";
-} catch (IOException e) {
+} catch (GeneralException | IOException e) {
Debug.logError(e, "Error rendering OrderContent, inserting empty
String", module);
return "";
}
@@ -149,7 +146,7 @@ public class OrderContentWrapper impleme
.cache(cache).filterByDate().queryFirst();
if (orderContent != null) {
// when rendering the order content, always include the
OrderHeader/OrderItem and OrderContent records that this comes from
-Map inContext = new HashMap();
+Map inContext = new HashMap<>();
inContext.put("order", order);
inContext.put("orderContent", orderContent);
ContentWorker.renderContentAsText(dispatcher,
orderContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId,
null, null, cache);
Modified:
svn commit: r1818846 [3/3] - /ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java?rev=1818846=1818845=1818846=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
Wed Dec 20 19:56:26 2017
@@ -97,8 +97,8 @@ public class OrderServices {
public static final String resource_error = "OrderErrorUiLabels";
public static final String resourceProduct = "ProductUiLabels";
-private static Map salesAttributeRoleMap = new
HashMap();
-private static Map purchaseAttributeRoleMap = new
HashMap();
+private static Map salesAttributeRoleMap = new HashMap<>();
+private static Map purchaseAttributeRoleMap = new
HashMap<>();
static {
salesAttributeRoleMap.put("placingCustomerPartyId",
"PLACING_CUSTOMER");
salesAttributeRoleMap.put("billToCustomerPartyId", "BILL_TO_CUSTOMER");
@@ -150,7 +150,7 @@ public class OrderServices {
hasPermission = true;
} else {
// check sales agent/customer relationship
-List repsCustomers = new
LinkedList();
+List repsCustomers = new LinkedList<>();
try {
repsCustomers =
EntityUtil.filterByDate(userLogin.getRelatedOne("Party",
false).getRelated("FromPartyRelationship", UtilMisc.toMap("roleTypeIdFrom",
"AGENT", "roleTypeIdTo", "CUSTOMER", "partyIdTo", partyId), null, false));
} catch (GenericEntityException ex) {
@@ -182,7 +182,7 @@ public class OrderServices {
Delegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
Security security = ctx.getSecurity();
-List toBeStored = new LinkedList();
+List toBeStored = new LinkedList<>();
Locale locale = (Locale) context.get("locale");
Map successResult = ServiceUtil.returnSuccess();
@@ -196,7 +196,7 @@ public class OrderServices {
// SALES ORDERS - if userLogin has ORDERMGR_SALES_CREATE or
ORDERMGR_CREATE permission, or if it is same party as the partyId, or
// if it is an AGENT (sales rep) creating an order for
his customer
// PURCHASE ORDERS - if there is a PURCHASE_ORDER permission
-Map resultSecurity = new HashMap();
+Map resultSecurity = new HashMap<>();
boolean hasPermission = OrderServices.hasPermission(orderTypeId,
partyId, userLogin, "CREATE", security);
// final check - will pass if userLogin's partyId = partyId for order
or if userLogin has ORDERMGR_CREATE permission
// jacopoc: what is the meaning of this code block? FIXME
@@ -255,10 +255,10 @@ public class OrderServices {
List orderItemPriceInfo =
UtilGenerics.checkList(context.get("orderItemPriceInfos"));
// check inventory and other things for each item
-List errorMessages = new LinkedList();
-Map normalizedItemQuantities = new HashMap();
-Map normalizedItemNames = new HashMap();
-Map itemValuesBySeqId = new HashMap();
+List errorMessages = new LinkedList<>();
+Map normalizedItemQuantities = new HashMap<>();
+Map normalizedItemNames = new HashMap<>();
+Map itemValuesBySeqId = new HashMap<>();
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
// need to run through the items combining any cases where multiple
lines refer to the
@@ -337,7 +337,7 @@ public class OrderServices {
if (orderDate != null &&
product.get("salesDiscontinuationDate") != null) {
salesDiscontinuationFlag =
orderDate.after(product.getTimestamp("salesDiscontinuationDate")) &&
nowTimestamp.after(product.getTimestamp("salesDiscontinuationDate"));
} else if (product.get("salesDiscontinuationDate") != null) {
-salesDiscontinuationFlag =
nowTimestamp.after(product.getTimestamp("salesDiscontinuationDate"));
+salesDiscontinuationFlag =
nowTimestamp.after(product.getTimestamp("salesDiscontinuationDate"));
}
// check to see if salesDiscontinuationDate has passed
if (salesDiscontinuationFlag)
svn commit: r1818846 [2/3] - /ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java?rev=1818846=1818845=1818846=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
Wed Dec 20 19:56:26 2017
@@ -82,7 +82,9 @@ public class OrderReturnServices {
rounding = UtilNumber.getBigDecimalRoundingMode("invoice.rounding");
// set zero to the proper scale
-if (decimals != -1) ZERO = ZERO.setScale(decimals);
+if (decimals != -1) {
+ZERO = ZERO.setScale(decimals);
+}
}
// locate the return item's initial inventory item cost
@@ -220,7 +222,7 @@ public class OrderReturnServices {
.queryList();
} catch (GenericEntityException e) {
Debug.logError(e, module);
-return
ServiceUtil.returnError(UtilProperties.getMessage(resource_error,
+return
ServiceUtil.returnError(UtilProperties.getMessage(resource_error,
"OrderErrorUnableToGetReturnItemRecordsFromReturnHeader",
locale));
}
@@ -247,7 +249,7 @@ public class OrderReturnServices {
// get the email setting and send the mail
if (UtilValidate.isNotEmpty(productStoreId)) {
-Map sendMap = new HashMap();
+Map sendMap = new HashMap<>();
GenericValue productStoreEmail = null;
try {
@@ -297,9 +299,9 @@ public class OrderReturnServices {
}
}
-return
ServiceUtil.returnFailure(UtilProperties.getMessage(resourceProduct,
-"ProductProductStoreEmailSettingsNotValid",
-UtilMisc.toMap("productStoreId", productStoreId,
+return
ServiceUtil.returnFailure(UtilProperties.getMessage(resourceProduct,
+"ProductProductStoreEmailSettingsNotValid",
+UtilMisc.toMap("productStoreId", productStoreId,
"emailType", emailType), locale));
}
@@ -440,8 +442,8 @@ public class OrderReturnServices {
String returnStatus = returnHeader.getString("statusId");
if (!"RETURN_CANCELLED".equals(returnStatus)) {
if(UtilValidate.isNotEmpty(returnItem.getBigDecimal("returnQuantity"))){
-returnedQty =
returnedQty.add(returnItem.getBigDecimal("returnQuantity"));
-}
+returnedQty =
returnedQty.add(returnItem.getBigDecimal("returnQuantity"));
+}
}
}
if (returnedQty.compareTo(orderQty) < 0) {
@@ -474,9 +476,8 @@ public class OrderReturnServices {
"OrderErrorUnableToGetReturnItemInformation", locale));
}
-Map> returnable = new
LinkedHashMap>();
+Map> returnable = new
LinkedHashMap<>();
if (orderHeader != null) {
-// OrderReadHelper orh = new OrderReadHelper(orderHeader);
// OrderItems which have been issued may be returned.
EntityConditionList whereConditions =
EntityCondition.makeCondition(UtilMisc.toList(
EntityCondition.makeCondition("orderId",
EntityOperator.EQUALS, orderHeader.getString("orderId")),
@@ -528,56 +529,54 @@ public class OrderReturnServices {
}
if (serviceResult.containsKey(ModelService.ERROR_MESSAGE))
{
return ServiceUtil.returnError((String)
serviceResult.get(ModelService.ERROR_MESSAGE));
-} else {
-
-// Don't add the OrderItem to the map of returnable
OrderItems if there isn't any returnable quantity.
-if (((BigDecimal)
serviceResult.get("returnableQuantity")).compareTo(BigDecimal.ZERO) == 0) {
-continue;
-}
-Map returnInfo = new HashMap();
-// first the return info (quantity/price)
-returnInfo.put("returnableQuantity",
serviceResult.get("returnableQuantity"));
-returnInfo.put("returnablePrice",
serviceResult.get("returnablePrice"));
-
-// now the product type information
-String itemTypeKey =
svn commit: r1818845 - in /ofbiz/ofbiz-plugins/trunk: bi/src/main/java/org/apache/ofbiz/bi/util/ birt/src/main/java/org/apache/ofbiz/birt/ birt/src/main/java/org/apache/ofbiz/birt/container/
Author: mbrohl
Date: Wed Dec 20 19:45:02 2017
New Revision: 1818845
URL: http://svn.apache.org/viewvc?rev=1818845=rev
Log:
Improved: Fixing defects reported by code analysis tools, package
org.apache.ofbiz -bi.util, -birt and -birt.container.
(OFBIZ-10102)
Thanks Julian Leichert for reporting and providing the patch.
Modified:
ofbiz/ofbiz-plugins/trunk/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtFactory.java
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/container/BirtContainer.java
Modified:
ofbiz/ofbiz-plugins/trunk/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java?rev=1818845=1818844=1818845=diff
==
---
ofbiz/ofbiz-plugins/trunk/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java
(original)
+++
ofbiz/ofbiz-plugins/trunk/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java
Wed Dec 20 19:45:02 2017
@@ -70,7 +70,7 @@ public class DimensionServices {
Locale locale = (Locale) context.get("locale");
try {
-Map andCondition = new HashMap();
+Map andCondition = new HashMap<>();
for (String naturalKeyField: naturalKeyFields) {
andCondition.put(naturalKeyField,
dimensionValue.get(naturalKeyField));
}
@@ -149,14 +149,14 @@ public class DimensionServices {
dateValue.set("description",
dayDescriptionFormat.format(currentDate));
int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
dateValue.set("dayName", dayNameFormat.format(currentDate));
-dateValue.set("dayOfMonth", new
Long(calendar.get(Calendar.DAY_OF_MONTH)));
-dateValue.set("dayOfYear", new
Long(calendar.get(Calendar.DAY_OF_YEAR)));
+dateValue.set("dayOfMonth",
Long.valueOf(calendar.get(Calendar.DAY_OF_MONTH)));
+dateValue.set("dayOfYear",
Long.valueOf(calendar.get(Calendar.DAY_OF_YEAR)));
dateValue.set("monthName", monthNameFormat.format(currentDate));
-dateValue.set("monthOfYear", new Long(calendar.get(Calendar.MONTH)
+ 1));
-dateValue.set("yearName", new Long(calendar.get(Calendar.YEAR)));
-dateValue.set("weekOfMonth", new
Long(calendar.get(Calendar.WEEK_OF_MONTH)));
-dateValue.set("weekOfYear", new
Long(calendar.get(Calendar.WEEK_OF_YEAR)));
+dateValue.set("monthOfYear",
Long.valueOf(calendar.get(Calendar.MONTH) + 1));
+dateValue.set("yearName",
Long.valueOf(calendar.get(Calendar.YEAR)));
+dateValue.set("weekOfMonth",
Long.valueOf(calendar.get(Calendar.WEEK_OF_MONTH)));
+dateValue.set("weekOfYear",
Long.valueOf(calendar.get(Calendar.WEEK_OF_YEAR)));
dateValue.set("weekdayType", (dayOfWeek == 1 || dayOfWeek == 7?
"Weekend": "Weekday"));
dateValue.set("yearMonthDay",
yearMonthDayFormat.format(currentDate));
dateValue.set("yearAndMonth", yearMonthFormat.format(currentDate));
Modified:
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtFactory.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtFactory.java?rev=1818845=1818844=1818845=diff
==
---
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtFactory.java
(original)
+++
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtFactory.java
Wed Dec 20 19:45:02 2017
@@ -39,8 +39,8 @@ public class BirtFactory {
public final static String module = BirtFactory.class.getName();
-protected static IReportEngine engine;
-
+private static IReportEngine engine;
+
/**
* set report engine
* @param engine
Modified:
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java?rev=1818845=1818844=1818845=diff
==
---
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java
(original)
+++
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java
Wed Dec 20 19:45:02 2017
@@ -19,9 +19,7 @@
package org.apache.ofbiz.birt;
import java.io.File;
-import java.io.IOException;
import java.io.OutputStream;
-import java.io.StringWriter;
import java.sql.SQLException;
import java.util.HashMap;
svn commit: r1818789 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/includes/Footer.ftl webapp/ecommerce/css/custom.css webapp/ecommerce/images/ecommain.css widget/CommonScreens.xml
Author: deepak
Date: Wed Dec 20 12:41:25 2017
New Revision: 1818789
URL: http://svn.apache.org/viewvc?rev=1818789=rev
Log:
Improved: Updated footer markup, now footer will be render properly on all
pages.
Thanks Parakh for your contribution
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl?rev=1818789=1818788=1818789=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl Wed Dec 20
12:41:25 2017
@@ -19,6 +19,7 @@ under the License.
<#assign nowTimestamp =
Static["org.apache.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
+
@@ -39,3 +40,4 @@ under the License.
${uiLabelMap.EcommerceSeeStorePoliciesHere}
+
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css?rev=1818789=1818788=1818789=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css Wed Dec
20 12:41:25 2017
@@ -58,4 +58,8 @@
.quick-links a, #paginationBox a {
color: #00;
+}
+
+.footer-block {
+background: #f8f9fa;
}
\ No newline at end of file
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css?rev=1818789=1818788=1818789=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
Wed Dec 20 12:41:25 2017
@@ -259,8 +259,16 @@ margin-top:10px;
position:relative;
width:100%;
text-align:left;
+flex:1;
}
+#parentContainer {
+display: flex;
+min-height: 100vh;
+flex-direction: column;
+}
+
+
#ecom-mainarea .left {
background:#fff;
float:left;
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml?rev=1818789=1818788=1818789=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Wed Dec 20
12:41:25 2017
@@ -81,6 +81,7 @@ under the License.
+
@@ -99,6 +100,7 @@ under the License.
+
buildbot success in on ofbiz-trunk-framework-plugins
The Buildbot has detected a restored build on builder ofbiz-trunk-framework-plugins while building . Full details are available at: https://ci.apache.org/builders/ofbiz-trunk-framework-plugins/builds/977 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-ofbiz-plugins-commit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-plugins/trunk] 1818787 Blamelist: deepak Build succeeded! Sincerely, -The Buildbot
svn commit: r1818787 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/catalog/ProductDetail.ftl template/customer/MiniSignUpForContactList.ftl webapp/ecommerce/css/custom.css webapp/ecommerce/image
Author: deepak
Date: Wed Dec 20 12:19:24 2017
New Revision: 1818787
URL: http://svn.apache.org/viewvc?rev=1818787=rev
Log:
Improved: Update markup of Product Detail page according to standard markup
given by Bootstrap v4.0.s (OFBIZ-10099)
Thanks Mayank Lambhate for your contribution.
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl?rev=1818787=1818786=1818787=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl Wed
Dec 20 12:19:24 2017
@@ -334,7 +334,7 @@ $(function(){
-
+
<#assign productAdditionalImage1 =
productContentWrapper.get("ADDITIONAL_IMAGE_1", "url")! />
<#assign productAdditionalImage2 =
productContentWrapper.get("ADDITIONAL_IMAGE_2", "url")! />
<#assign productAdditionalImage3 =
productContentWrapper.get("ADDITIONAL_IMAGE_3", "url")! />
@@ -345,22 +345,25 @@ $(function(){
<#if previousProductId??>
${uiLabelMap.CommonPrevious}|
+>${uiLabelMap.CommonPrevious}|
${(category.categoryName)?default(category.description)!}
<#if nextProductId??>|
${uiLabelMap.CommonNext}
+>${uiLabelMap.CommonNext}
-
-<#if productImageList?has_content>
+
+
+
+
+ <#if productImageList?has_content>
<#-- Product image/name/price -->
-
+
<#assign productLargeImageUrl =
productContentWrapper.get("LARGE_IMAGE_URL", "url")! />
<#-- remove the next two lines to always display the virtual image
first (virtual images must exist) -->
<#if firstLargeImage?has_content>
@@ -379,19 +382,19 @@ $(function(){
<#-- Show Image Approved -->
-
<#if productImageList?has_content>
- <#list productImageList as productImage>
-
-
-
-
-
-
+
+<#list productImageList as productImage>
+
+
+
+
+
+
+
-
<#else>
<#-- Product image/name/price -->
@@ -451,11 +454,11 @@ $(function(){
-
-
+
+
${productContentWrapper.get("PRODUCT_NAME", "html")!}
- ${productContentWrapper.get("DESCRIPTION", "html")!}
- ${product.productId!}
+ ${productContentWrapper.get("DESCRIPTION", "html")!}
+ ${product.productId!}
<#-- example of showing a certain type of feature with the product -->
<#if sizeProductFeatureAndAppls?has_content>
@@ -627,7 +630,7 @@ $(function(){
${uiLabelMap.CommonTellAFriend}
+>${uiLabelMap.CommonTellAFriend}
<#if disFeatureList?? && 0 disFeatureList.size()>
@@ -645,18 +648,18 @@ $(function(){
-
-
<#assign inStock = true />
<#assign commentEnable =
Static["org.apache.ofbiz.entity.util.EntityUtilProperties"]
.getPropertyValue("order", "order.item.comment.enable", delegator)>
<#if commentEnable.equals("Y")>
<#assign orderItemAttr =
Static["org.apache.ofbiz.entity.util.EntityUtilProperties"]
.getPropertyValue("order", "order.item.attr.prefix", delegator)>
- ${uiLabelMap.CommonComment}
+
+ ${uiLabelMap.CommonComment}
+
<#-- Variant Selection -->
<#if "Y" == product.isVirtual!?upper_case>
@@ -666,7 +669,7 @@ $(function(){
<#if feature_index == 0>
${feature.description}:
-
${uiLabelMap.EcommerceSelectOption}
@@ -686,16 +689,16 @@ $(function(){
${uiLabelMap.CommonQuantity}:
-
-
+ ${uiLabelMap.OrderAddToCart}
${uiLabelMap.CommonQuantity}:
-
+
${uiLabelMap.OrderAddToCart}
+ class="btn btn-outline-secondary">${uiLabelMap.OrderAddToCart}
@@ -703,7 +706,7 @@ $(function(){
<#if variantTree?? && (variantTree.size() 0)>
<#list featureSet
buildbot failure in on ofbiz-trunk-framework-plugins
The Buildbot has detected a new failure on builder ofbiz-trunk-framework-plugins while building . Full details are available at: https://ci.apache.org/builders/ofbiz-trunk-framework-plugins/builds/976 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-ofbiz-plugins-commit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-plugins/trunk] 1818776 Blamelist: deepak BUILD FAILED: failed shell_4 Sincerely, -The Buildbot
svn commit: r1818776 - /ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/QuoteList.ftl
Author: deepak
Date: Wed Dec 20 11:19:54 2017
New Revision: 1818776
URL: http://svn.apache.org/viewvc?rev=1818776=rev
Log:
Improved: Update markup of List Quotes page according to standard markup given
by Bootstrap v4.0.s (OFBIZ-10095)
Thanks Nitish Mishra for your contribution
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/QuoteList.ftl
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/QuoteList.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/QuoteList.ftl?rev=1818776=1818775=1818776=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/QuoteList.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/QuoteList.ftl Wed Dec 20
11:19:54 2017
@@ -17,70 +17,67 @@ specific language governing permissions
under the License.
-->
-
-${uiLabelMap.EcommerceQuoteHistory}
-
-
-
-
-${uiLabelMap.OrderQuote} ${uiLabelMap.CommonNbr}
-
-
-
-${uiLabelMap.CommonName}
-
-
-
-${uiLabelMap.CommonDescription}
-
-
-
-${uiLabelMap.CommonStatus}
-
-
-
-${uiLabelMap.OrderOrderQuoteIssueDate}
-${uiLabelMap.CommonValidFromDate}
-${uiLabelMap.CommonValidThruDate}
-
-
-
-
+
+
+ ${uiLabelMap.EcommerceQuoteHistory}
+
+
+<#if quoteList?has_content>
+
+
+
+
+${uiLabelMap.OrderQuote} ${uiLabelMap.CommonNbr}
+
+
+${uiLabelMap.CommonName}
+
+
+${uiLabelMap.CommonDescription}
+
+
+${uiLabelMap.CommonStatus}
+
+
+${uiLabelMap.OrderOrderQuoteIssueDate}
+
+${uiLabelMap.CommonValidFromDate}
+${uiLabelMap.CommonValidThruDate}
+
+
+
+
<#list quoteList as quote>
<#assign status = quote.getRelatedOne("StatusItem", true)>
-
-${quote.quoteId}
+ ${quote.quoteId!}
-
-${quote.quoteName!}
+ ${quote.quoteName?default("N/A")}
-
-${quote.description!}
+ ${quote.description?default("N/A")}
-
-${status.get("description",locale)}
+ ${status.get("description",locale)?default("N/A")}
-
-${quote.issueDate!}
-${quote.validFromDate!}
-${quote.validThruDate!}
+ ${quote.issueDate?default("N/A")}
-
-
+${quote.validFromDate?default("N/A")}
+${quote.validThruDate?default("N/A")}
+
${uiLabelMap.CommonView}
-
-<#if !quoteList?has_content>
-${uiLabelMap.OrderNoQuoteFound}
-
+
+<#else>
+
+ ${uiLabelMap.OrderNoQuoteFound}
+
+
svn commit: r1818774 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/request/ widget/
Author: deepak
Date: Wed Dec 20 11:15:54 2017
New Revision: 1818774
URL: http://svn.apache.org/viewvc?rev=1818774=rev
Log:
Improved: Update markup of List Requests page according to standard markup
given by Bootstrap v4.0.s (OFBIZ-10092)
Thanks Nitish Mishra for your contribution
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl
(with props)
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestDate.ftl
(with props)
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/ViewRequestItemInfo.ftl
(with props)
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestInfo.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestList.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestRoles.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustRequestScreens.xml
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl?rev=1818774=auto
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl
(added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl
Wed Dec 20 11:15:54 2017
@@ -0,0 +1,78 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if fulfillContactMech?has_content>
+
+<#if "POSTAL_ADDRESS" == fulfillContactMech.contactMechTypeId>
+ <#assign label = uiLabelMap.PartyAddressMailingShipping>
+ <#assign postalAddress = fulfillContactMech.getRelatedOne("PostalAddress",
true)!>
+<#elseif "EMAIL_ADDRESS" == fulfillContactMech.contactMechTypeId>
+ <#assign label = uiLabelMap.PartyToEmailAddress>
+ <#assign emailAddress = fulfillContactMech.infoString!>
+<#elseif "TELECOM_NUMBER" == fulfillContactMech.contactMechTypeId>
+ <#assign label = uiLabelMap.PartyPhoneNumber>
+ <#assign telecomNumber = fulfillContactMech.getRelatedOne("TelecomNumber",
true)!>
+
+
+
+
+${uiLabelMap.PartyContactInformation}
+
+
+
+
+
+${label?default(uiLabelMap.PartyUnknown)}
+
+
+
+ <#if emailAddress?has_content>${emailAddress}
+
+ <#if postalAddress?has_content>
+<#if postalAddress.toName?has_content>${uiLabelMap.PartyAddrToName}${postalAddress.toName}
+<#if postalAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}${postalAddress.attnName}
+${postalAddress.address1!}
+<#if
postalAddress.address2?has_content>${postalAddress.address2}
+${postalAddress.city!},
+<#if postalAddress.stateProvinceGeoId?has_content>
+<#assign stateProvince =
postalAddress.getRelatedOne("StateProvinceGeo", true)>
+
${stateProvince.abbreviation?default(stateProvince.geoId)}
+
+${postalAddress.postalCode!}
+<#if postalAddress.countryGeoId?has_content>
+ <#assign country =
postalAddress.getRelatedOne("CountryGeo", true)>
+ ${country.geoName?default(country.geoId)}
+
+
+
+ <#if telecomNumber?has_content>
+${telecomNumber.countryCode!}
+<#if
telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-${telecomNumber.contactNumber?default("000-")}
+<#if (telecomNumber?has_content &&
!telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011">
+ ${uiLabelMap.CommonLookupAnywho}
+ ${uiLabelMap.CommonLookupWhitepages}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Propchange:
svn commit: r1818773 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/catalog/CategoryDetail.ftl template/catalog/ProductSummary.ftl template/catalog/ShowBestSellingCategory.ftl webapp/ecommerce/cs
Author: deepak
Date: Wed Dec 20 11:08:53 2017
New Revision: 1818773
URL: http://svn.apache.org/viewvc?rev=1818773=rev
Log:
Improved: Update markup of Home page product summary section to standard markup
given by Bootstrap v4.0.0 (OFBIZ-10055)
Thanks Saurabh Dixit for your contribution
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl
(with props)
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductSummary.ftl
(with props)
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CatalogScreens.xml
Added: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl?rev=1818773=auto
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl
(added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl Wed
Dec 20 11:08:53 2017
@@ -0,0 +1,187 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+function callDocumentByPaginate(info) {
+var str = info.split('~');
+var checkUrl = '<@ofbizUrl>categoryAjaxFired';
+if(checkUrl.search("http"))
+var ajaxUrl = '<@ofbizUrl>categoryAjaxFired';
+else
+var ajaxUrl = '<@ofbizUrl>categoryAjaxFiredSecure';
+
+//jQuerry Ajax Request
+jQuery.ajax({
+url: ajaxUrl,
+type: 'POST',
+data: {"category_id" : str[0], "VIEW_SIZE" : str[1], "VIEW_INDEX"
: str[2]},
+error: function(msg) {
+alert("An error occurred loading content! : " + msg);
+},
+success: function(msg) {
+jQuery('#div3').html(msg);
+}
+});
+ }
+
+
+ <#macro paginationControls>
+<#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize)?double /
viewSize?double)/>
+<#if (viewIndexMax?int > 0)>
+
+
+
+
+ ${uiLabelMap.CommonPage} ${viewIndex?int + 1}
${uiLabelMap.CommonOf} ${viewIndexMax}
+ <#if (viewIndex?int > 1)>
+<#list 1..viewIndexMax as curViewNum>
+ ${uiLabelMap.CommonGotoPage}
${curViewNum}
+
+
+
+<#-- End Page Select Drop-Down -->
+ <#if (viewIndex?int > 0)>
+${uiLabelMap.CommonPrevious} |
+
+ <#if ((listSize?int - viewSize?int) > 0)>
+${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf}
${listSize}
+
+ <#if highIndex?int < listSize?int>
+ | ${uiLabelMap.CommonNext}
+
+
+
+
+
+
+
+
+ <#if productCategory??>
+<#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME",
"html")!/>
+<#assign categoryDescription = categoryContentWrapper.get("DESCRIPTION",
"html")!/>
+<#if categoryName?has_content>
+
+
+
+${categoryName} <#if
categoryDescription?has_content>${(categoryDescription)!}
+
+
+
+ <#if hasQuantities??>
+
+
+ <#if requestParameters.product_id??>
+ <#if requestParameters.category_id??>
+ <#if requestParameters.VIEW_INDEX??>
+ <#if requestParameters.SEARCH_STRING??>
+ <#if requestParameters.SEARCH_CATEGORY_ID??>
+ ${uiLabelMap.ProductAddProductsUsingDefaultQuantities}
+
+
+ <#if "Y" == searchInCategory?default("Y")>
+${uiLabelMap.ProductSearchInCategory}
+
+ <#assign longDescription =
categoryContentWrapper.get("LONG_DESCRIPTION", "html")!/>
+ <#assign categoryImageUrl =
categoryContentWrapper.get("CATEGORY_IMAGE_URL", "url")!/>
+ <#if categoryImageUrl?string?has_content ||
longDescription?has_content>
+
+ <#if
svn commit: r1818765 - in /ofbiz: ofbiz-framework/trunk/applications/datamodel/DATAMODEL_CHANGES.md tools/wiki-files/data-model/ tools/wiki-files/data-model/DATAMODEL_CHANGES.md.html tools/wiki-files/
Author: jleroux
Date: Wed Dec 20 09:44:43 2017
New Revision: 1818765
URL: http://svn.apache.org/viewvc?rev=1818765=rev
Log:
Completed: Create a DATAMODELCHANGES.md to track data model changes
(OFBIZ-9902)
We have already the wiki page Revisions+Requiring+Data+Migration+-+upgrade+ofbiz
but it's only by revisions.
This adds a applications/datamodel/DATAMODEL_CHANGES.md document by releases
and put an HTML copy in tools/wiki-files/data-model which will be referenced
by the wiki page above
I wondered about putting a copy in
tools/documentation/data-model/DATAMODEL_CHANGES.md but I think it's not needed
Also updates themes/README.md.html while at it
Thanks: Aditya Deepak and all http://markmail.org/message/4mrffmp5j2mujv3w
participants
Added:
ofbiz/ofbiz-framework/trunk/applications/datamodel/DATAMODEL_CHANGES.md
(with props)
ofbiz/tools/wiki-files/data-model/
ofbiz/tools/wiki-files/data-model/DATAMODEL_CHANGES.md.html (with props)
Modified:
ofbiz/tools/wiki-files/themes/README.md.html
Added: ofbiz/ofbiz-framework/trunk/applications/datamodel/DATAMODEL_CHANGES.md
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/DATAMODEL_CHANGES.md?rev=1818765=auto
==
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/DATAMODEL_CHANGES.md
(added)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/DATAMODEL_CHANGES.md Wed
Dec 20 09:44:43 2017
@@ -0,0 +1,381 @@
+
+Apache OFBiz® Data Model Changes
+=
+Apache OFBiz follows **The Universal Data Model** by **Len Silverston**, with
a grain of salt.
+
+The following file contains information about the data model changes in the
Apache OFBiz.
+The detailed description of migration scripts specified here can be found at
[Revisions Requiring Data Migration - upgrade
ofbiz](https://cwiki.apache.org/confluence/x/LoBr) page.
+
+##Changes with OFBiz 17
+Field types "id-ne", "id-long-ne" & "id-vlong-ne" has been removed. Use "id",
"id-long" and "id-vlong" instead (detailed description at
[OFBIZ-9351](https://issues.apache.org/jira/browse/OFBIZ-9351)).
+
+###Entity Changes
+No changes
+
+###Field Changes
+
+| Entity | Field | Action | IsPK | Revision |
+|:- |:---:|:---:|:---:|
-:|
+| MarketingCampaignPrice | fromDate | Added | Yes | R1805961 |
+| MarketingCampaignPrice | thruDate | Added | No | R1805961 |
+| MarketingCampaignPromo | fromDate | Added | Yes | R1805961 |
+| MarketingCampaignPromo | thruDate | Added | No | R1805961 |
+| MarketingCampaignRole | fromDate | Added | Yes | R1805961 |
+| MarketingCampaignRole | thruDate | Added | No | R1805961 |
+| Product | manufacturerPartyId | Removed | No| R1804408 |
+| SecurityGroupPermission | fromDate | Added | Yes | R1812383 |
+| SecurityGroupPermission | thruDate | Added | No | R1812383 |
+
+###Migration Scripts
+1. Updated sql-type for date-time and time field in fieldtypemysql.xml file
+R1793300 "Update msyql sql-type for datetime field-type to support Fractional
Seconds in Time Values
+Please upgrade mysql to at least 5.6.4 or higher.
+After upgrade run 'generateMySqlFileWithAlterTableForTimestamps' service,
groupName is required field for this service,
+It will generate sql file with alter query statement for date-time and time
field at location "${ofbiz.home}/runtime/tempfiles/.sql"
+You can use execute sql statement from any of the mysql batch command.
+
+##Changes between OFBiz 9 to OFBiz 16
+
+###Entity Changes
+**Added 77 new entities**
+
+1. JobRequisition
+2. ProductAverageCostType
+3. WorkEffortSurveyAppl
+4. WorkEffortIcalData
+5. WebSiteContactList
+6. WebAnalyticsType
+7. WebAnalyticsConfig
+8. UserLoginSecurityQuestion
+9. UomGroup
+10. TrainingRequest
+11. ThirdPartyLogin
+12. TestFieldType
+13. TestingSubtype
+14. TestingStatus
+15. TestingRemoveAll
+16. TestingItem
+17. TestingCrypto
+18. SystemProperty
+19. ShipmentGatewayUsps
+20. ShipmentGatewayUps
+21. ShipmentGatewayFedex
+22. ShipmentGatewayDhl
+23. ShipmentGatewayConfig
+24. ShipmentGatewayConfigType
+25. ReturnContactMech
+26. QuoteNote
+27. ProductPromoContent
+28. ProductPromoContentType
+29. ProductGroupOrder
+30. ProductCostComponentCalc
+31. CostComponentCalc
+32. PayPalPaymentMethod
+33. PaymentGroupType
+34. PaymentGroup
+35. PaymentGroupMember
+36. PaymentGatewayConfig
+37. PaymentGatewayConfigType
+38. PaymentGatewayWorldPay
+39. PaymentGatewaySecurePay
+40. PaymentGatewaySagePay
+41. PaymentGatewayOrbital
+42. PaymentGatewayEway
+43. PaymentGatewayCyberSource
+44. PaymentGatewayAuthorizeNet
+45. PaymentGatewayIDEAL
+46. PaymentContentType
+47. PaymentContent
+48. OAuth2LinkedIn
+49. OAuth2GitHub
+50. JobManagerLock
+51. JobInterviewType
+52. JobInterview
+53. JavaResource
+54. InvoiceNote
+55. InvoiceItemAssocType
+56. InvoiceItemAssoc
+57. InvoiceContentType
+58. InvoiceContent
+59.
