You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ar...@apache.org on 2016/11/02 19:09:18 UTC
svn commit: r1767764 [33/33] - in /ofbiz/trunk:
applications/accounting/groovyScripts/admin/
applications/accounting/groovyScripts/ap/invoices/
applications/accounting/groovyScripts/ar/
applications/accounting/groovyScripts/chartofaccounts/ application...
Modified: ofbiz/trunk/specialpurpose/scrum/groovyScripts/SprintBacklogListItems.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/groovyScripts/SprintBacklogListItems.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/groovyScripts/SprintBacklogListItems.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/groovyScripts/SprintBacklogListItems.groovy Wed Nov 2 19:09:13 2016
@@ -17,105 +17,105 @@
* under the License.
*/
-import org.apache.ofbiz.entity.condition.*;
-import org.apache.ofbiz.base.util.*;
+import org.apache.ofbiz.entity.condition.*
+import org.apache.ofbiz.base.util.*
-taskStatusId = null;
-reopenedStatusId = null;
-backlogStatusId = parameters.backlogStatusId;
-paraBacklogStatusId = backlogStatusId;
-currentStatus = sprintStatus.currentStatusId;
-projectSprintList = [];
+taskStatusId = null
+reopenedStatusId = null
+backlogStatusId = parameters.backlogStatusId
+paraBacklogStatusId = backlogStatusId
+currentStatus = sprintStatus.currentStatusId
+projectSprintList = []
if ("SPRINT_CLOSED".equals(currentStatus)) {
- backlogStatusId = null;
+ backlogStatusId = null
} else {
if (backlogStatusId == "Any") {
- backlogStatusId = null;
+ backlogStatusId = null
} else {
- backlogStatusId = "CRQ_REVIEWED";
- reopenedStatusId = "CRQ_REOPENED";
- taskStatusId = "STS_CREATED";
+ backlogStatusId = "CRQ_REVIEWED"
+ reopenedStatusId = "CRQ_REOPENED"
+ taskStatusId = "STS_CREATED"
}
}
-orCurentExprs = [];
+orCurentExprs = []
if (taskStatusId) {
- orCurentExprs.add(EntityCondition.makeCondition("taskCurrentStatusId", EntityOperator.EQUALS, taskStatusId));
- orCurentExprs.add(EntityCondition.makeCondition("taskCurrentStatusId", EntityOperator.EQUALS, "SPRINT_ACTIVE"));
+ orCurentExprs.add(EntityCondition.makeCondition("taskCurrentStatusId", EntityOperator.EQUALS, taskStatusId))
+ orCurentExprs.add(EntityCondition.makeCondition("taskCurrentStatusId", EntityOperator.EQUALS, "SPRINT_ACTIVE"))
}
-orBacklogExprs = [];
+orBacklogExprs = []
if (backlogStatusId) {
- orBacklogExprs.add(EntityCondition.makeCondition("backlogStatusId", EntityOperator.EQUALS, backlogStatusId));
+ orBacklogExprs.add(EntityCondition.makeCondition("backlogStatusId", EntityOperator.EQUALS, backlogStatusId))
}
if (reopenedStatusId) {
- orBacklogExprs.add(EntityCondition.makeCondition("backlogStatusId", EntityOperator.EQUALS, reopenedStatusId));
+ orBacklogExprs.add(EntityCondition.makeCondition("backlogStatusId", EntityOperator.EQUALS, reopenedStatusId))
}
-andExprs = [];
+andExprs = []
if (parameters.projectId) {
- andExprs.add(EntityCondition.makeCondition("projectId", EntityOperator.EQUALS, parameters.projectId));
+ andExprs.add(EntityCondition.makeCondition("projectId", EntityOperator.EQUALS, parameters.projectId))
} else {
- andExprs.add(EntityCondition.makeCondition("projectId", EntityOperator.EQUALS, sprintStatus.workEffortParentId));
+ andExprs.add(EntityCondition.makeCondition("projectId", EntityOperator.EQUALS, sprintStatus.workEffortParentId))
}
if (orBacklogExprs) {
- andExprs.add(EntityCondition.makeCondition(orBacklogExprs, EntityOperator.OR));
+ andExprs.add(EntityCondition.makeCondition(orBacklogExprs, EntityOperator.OR))
}
if (orCurentExprs) {
- andExprs.add(EntityCondition.makeCondition(orCurentExprs, EntityOperator.OR));
+ andExprs.add(EntityCondition.makeCondition(orCurentExprs, EntityOperator.OR))
}
- andExprs.add(EntityCondition.makeCondition("sprintId", EntityOperator.EQUALS, parameters.sprintId));
- andExprs.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT"));
+ andExprs.add(EntityCondition.makeCondition("sprintId", EntityOperator.EQUALS, parameters.sprintId))
+ andExprs.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT"))
-projectSprintCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
-projectSprintList = from("ProjectSprintBacklogAndTask").where(andExprs).orderBy("custSequenceNum","custRequestId","taskTypeId").queryList();
+projectSprintCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND)
+projectSprintList = from("ProjectSprintBacklogAndTask").where(andExprs).orderBy("custSequenceNum","custRequestId","taskTypeId").queryList()
-context.listIt = projectSprintList;
-context.paraBacklogStatusId = paraBacklogStatusId;
+context.listIt = projectSprintList
+context.paraBacklogStatusId = paraBacklogStatusId
//get backlog and task information
if (parameters.sprintId) {
//get total backlog size
- completedBacklog = 0;
- reviewedBacklog = 0;
- totalbacklog = 0;
- allTask = [];
- sprintList = from("CustRequestWorkEffort").where("workEffortId", parameters.sprintId).queryList();
+ completedBacklog = 0
+ reviewedBacklog = 0
+ totalbacklog = 0
+ allTask = []
+ sprintList = from("CustRequestWorkEffort").where("workEffortId", parameters.sprintId).queryList()
sprintList.each { sprintMap ->
- custMap = sprintMap.getRelatedOne("CustRequest", false);
+ custMap = sprintMap.getRelatedOne("CustRequest", false)
//if ("RF_PROD_BACKLOG".equals(custMap.custRequestTypeId)) {
- totalbacklog += 1;
+ totalbacklog += 1
if ("CRQ_REVIEWED".equals(custMap.statusId)){
- reviewedBacklog += 1;
+ reviewedBacklog += 1
} else {
- completedBacklog += 1;
+ completedBacklog += 1
}
//get task
- workEffortList = custMap.getRelated("CustRequestWorkEffort", null, null, false);
+ workEffortList = custMap.getRelated("CustRequestWorkEffort", null, null, false)
if (workEffortList) {
- allTask.addAll(workEffortList);
+ allTask.addAll(workEffortList)
}
//}
}
//get total task size
- completedTask = 0;
- createdTask = 0;
- totalTask = 0;
+ completedTask = 0
+ createdTask = 0
+ totalTask = 0
if (allTask) {
allTask.each { taskMap ->
- workEffMap = taskMap.getRelatedOne("WorkEffort", false);
+ workEffMap = taskMap.getRelatedOne("WorkEffort", false)
if (!"SCRUM_SPRINT".equals(workEffMap.workEffortTypeId)) {
- totalTask += 1;
+ totalTask += 1
if ("STS_CREATED".equals(workEffMap.currentStatusId)){
- createdTask += 1;
+ createdTask += 1
} else {
- completedTask += 1;
+ completedTask += 1
}
}
}
}
- context.completedBacklog = completedBacklog;
- context.reviewedBacklog = reviewedBacklog;
- context.totalbacklog = totalbacklog;
- context.completedTask = completedTask;
- context.createdTask = createdTask;
- context.totalTask = totalTask;
+ context.completedBacklog = completedBacklog
+ context.reviewedBacklog = reviewedBacklog
+ context.totalbacklog = totalbacklog
+ context.completedTask = completedTask
+ context.createdTask = createdTask
+ context.totalTask = totalTask
}
Modified: ofbiz/trunk/specialpurpose/scrum/groovyScripts/SprintBacklogOptions.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/groovyScripts/SprintBacklogOptions.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/groovyScripts/SprintBacklogOptions.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/groovyScripts/SprintBacklogOptions.groovy Wed Nov 2 19:09:13 2016
@@ -17,21 +17,21 @@
* under the License.
*/
-import org.apache.ofbiz.base.util.Debug;
+import org.apache.ofbiz.base.util.Debug
-custRequestWorkEffortList = [];
-sprintStatusId = "SPRINT_CLOSED";
-sprintId = null;
-custRequestWorkEffortList = custRequestMap.getRelated("CustRequestWorkEffort", null, null, false);
+custRequestWorkEffortList = []
+sprintStatusId = "SPRINT_CLOSED"
+sprintId = null
+custRequestWorkEffortList = custRequestMap.getRelated("CustRequestWorkEffort", null, null, false)
if (custRequestWorkEffortList) {
custRequestWorkEffortList.each { custWorkEffortMap ->
- workEffortMap = custWorkEffortMap.getRelatedOne("WorkEffort", false);
+ workEffortMap = custWorkEffortMap.getRelatedOne("WorkEffort", false)
if ("SCRUM_SPRINT".equals(workEffortMap.workEffortTypeId) && "SPRINT_ACTIVE".equals(workEffortMap.currentStatusId)) {
- sprintId = workEffortMap.workEffortId;
- sprintStatusId = "SPRINT_ACTIVE";
+ sprintId = workEffortMap.workEffortId
+ sprintStatusId = "SPRINT_ACTIVE"
}
}
}
-context.sprintId = sprintId;
-context.sprintStatusId = sprintStatusId;
+context.sprintId = sprintId
+context.sprintStatusId = sprintStatusId
Modified: ofbiz/trunk/specialpurpose/scrum/groovyScripts/TaskList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/groovyScripts/TaskList.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/groovyScripts/TaskList.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/groovyScripts/TaskList.groovy Wed Nov 2 19:09:13 2016
@@ -17,101 +17,101 @@
* under the License.
*/
-import java.util.*;
-import java.lang.*;
-import org.apache.tools.ant.taskdefs.Parallel.TaskList;
-import org.apache.ofbiz.base.util.*;
-import org.apache.ofbiz.entity.*;
-import org.apache.ofbiz.base.util.UtilMisc;
-import org.apache.ofbiz.base.util.UtilValidate;
-import org.apache.ofbiz.base.util.UtilDateTime;
-import org.apache.ofbiz.entity.util.*;
-import org.apache.ofbiz.entity.condition.*;
-import java.sql.Timestamp;
-
-partyId = userLogin.partyId;
-taskUnplanList = [];
-taskPlanList = [];
-taskPartyList = [];
-taskListDropdown = [];
+import java.util.*
+import java.lang.*
+import org.apache.tools.ant.taskdefs.Parallel.TaskList
+import org.apache.ofbiz.base.util.*
+import org.apache.ofbiz.entity.*
+import org.apache.ofbiz.base.util.UtilMisc
+import org.apache.ofbiz.base.util.UtilValidate
+import org.apache.ofbiz.base.util.UtilDateTime
+import org.apache.ofbiz.entity.util.*
+import org.apache.ofbiz.entity.condition.*
+import java.sql.Timestamp
+
+partyId = userLogin.partyId
+taskUnplanList = []
+taskPlanList = []
+taskPartyList = []
+taskListDropdown = []
//${projectId} - ${projectName} - ${sprintName} - ${groovy:description.substring(0,Math.min(description.length(),30))}[${custRequestId}] - ${groovy:taskName.substring(0,Math.min(taskName.length(),20))}[${taskId}]"/>
-taskUnplanList = from("ProjectSprintBacklogTaskAndParty").where("partyId", partyId,"taskCurrentStatusId", "STS_CREATED","custRequestTypeId","RF_UNPLAN_BACKLOG").orderBy("taskTypeId").queryList();
+taskUnplanList = from("ProjectSprintBacklogTaskAndParty").where("partyId", partyId,"taskCurrentStatusId", "STS_CREATED","custRequestTypeId","RF_UNPLAN_BACKLOG").orderBy("taskTypeId").queryList()
taskUnplanList.each { taskUnplanMap ->
- unplanMap=[:];
- custRequestId = taskUnplanMap.custRequestId;
- productlist = from("CustRequestItem").where("custRequestId", custRequestId).orderBy("productId").queryList();
+ unplanMap=[:]
+ custRequestId = taskUnplanMap.custRequestId
+ productlist = from("CustRequestItem").where("custRequestId", custRequestId).orderBy("productId").queryList()
productlist.each { productMap ->
- productId = productMap.productId;
- product = from("Product").where("productId", productId).queryOne();
- productName = product.internalName;
- unplanMap.taskId = taskUnplanMap.taskId;
- unplanMap.taskName = taskUnplanMap.taskName;
- unplanMap.projectId = taskUnplanMap.projectId;
- unplanMap.projectName = taskUnplanMap.projectName;
- unplanMap.sprintId = taskUnplanMap.sprintId;
- unplanMap.sprintName = taskUnplanMap.sprintName;
- unplanMap.custRequestId = custRequestId;
- unplanMap.description = taskUnplanMap.description;
- unplanMap.productId = productId;
- unplanMap.productName = productName;
+ productId = productMap.productId
+ product = from("Product").where("productId", productId).queryOne()
+ productName = product.internalName
+ unplanMap.taskId = taskUnplanMap.taskId
+ unplanMap.taskName = taskUnplanMap.taskName
+ unplanMap.projectId = taskUnplanMap.projectId
+ unplanMap.projectName = taskUnplanMap.projectName
+ unplanMap.sprintId = taskUnplanMap.sprintId
+ unplanMap.sprintName = taskUnplanMap.sprintName
+ unplanMap.custRequestId = custRequestId
+ unplanMap.description = taskUnplanMap.description
+ unplanMap.productId = productId
+ unplanMap.productName = productName
}
- taskPartyList.add(taskUnplanMap);
- taskListDropdown.add(unplanMap);
+ taskPartyList.add(taskUnplanMap)
+ taskListDropdown.add(unplanMap)
}
-exprBldr = [];
-exprBldr.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_PROD_BACKLOG"));
-exprBldr.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_SCRUM_MEETINGS"));
-andExprs = [];
-andExprs.add(EntityCondition.makeCondition("taskCurrentStatusId", EntityOperator.EQUALS, "STS_CREATED"));
-andExprs.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId));
-andExprs.add(EntityCondition.makeCondition(exprBldr, EntityOperator.OR));
-custRequestTypeCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
+exprBldr = []
+exprBldr.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_PROD_BACKLOG"))
+exprBldr.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_SCRUM_MEETINGS"))
+andExprs = []
+andExprs.add(EntityCondition.makeCondition("taskCurrentStatusId", EntityOperator.EQUALS, "STS_CREATED"))
+andExprs.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId))
+andExprs.add(EntityCondition.makeCondition(exprBldr, EntityOperator.OR))
+custRequestTypeCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND)
-taskPlanList = from("ProjectSprintBacklogTaskAndParty").where(custRequestTypeCond).orderBy("taskTypeId","projectId","sprintId").queryList();
+taskPlanList = from("ProjectSprintBacklogTaskAndParty").where(custRequestTypeCond).orderBy("taskTypeId","projectId","sprintId").queryList()
taskPlanList.each { taskPlanMap ->
- planMap=[:];
+ planMap=[:]
if ("RF_SCRUM_MEETINGS".equals(taskPlanMap.custRequestTypeId)) {
- workEffPartyAssignedList = from("WorkEffortPartyAssignment").where("partyId", partyId, "workEffortId", taskPlanMap.taskId).queryList();
- workEffPartyAssignedMap = workEffPartyAssignedList[0];
+ workEffPartyAssignedList = from("WorkEffortPartyAssignment").where("partyId", partyId, "workEffortId", taskPlanMap.taskId).queryList()
+ workEffPartyAssignedMap = workEffPartyAssignedList[0]
if (!"SCAS_COMPLETED".equals(workEffPartyAssignedMap.statusId)) {
- taskPartyList.add(taskPlanMap);
- taskListDropdown.add(taskPlanMap);
+ taskPartyList.add(taskPlanMap)
+ taskListDropdown.add(taskPlanMap)
}
} else {
if (taskPlanMap.projectId) {
- taskPartyList.add(taskPlanMap);
- taskListDropdown.add(taskPlanMap);
+ taskPartyList.add(taskPlanMap)
+ taskListDropdown.add(taskPlanMap)
} else {
- custRequestId = taskPlanMap.custRequestId;
- productlist = from("CustRequestItem").where("custRequestId", custRequestId).orderBy("productId").queryList();
- product = from("Product").where("productId", productlist[0].productId).queryOne();
- productName = product.internalName;
- planMap.taskId = taskPlanMap.taskId;
- planMap.taskTypeId = taskPlanMap.taskTypeId;
- planMap.taskName = taskPlanMap.taskName;
- planMap.projectId = taskPlanMap.projectId;
- planMap.projectName = taskPlanMap.projectName;
- planMap.sprintId = taskPlanMap.sprintId;
- planMap.sprintName = taskPlanMap.sprintName;
- planMap.custRequestId = custRequestId;
- planMap.description = taskPlanMap.description;
- planMap.productId = productlist[0].productId;
- planMap.productName = productName;
- taskPartyList.add(planMap);
- taskListDropdown.add(planMap);
+ custRequestId = taskPlanMap.custRequestId
+ productlist = from("CustRequestItem").where("custRequestId", custRequestId).orderBy("productId").queryList()
+ product = from("Product").where("productId", productlist[0].productId).queryOne()
+ productName = product.internalName
+ planMap.taskId = taskPlanMap.taskId
+ planMap.taskTypeId = taskPlanMap.taskTypeId
+ planMap.taskName = taskPlanMap.taskName
+ planMap.projectId = taskPlanMap.projectId
+ planMap.projectName = taskPlanMap.projectName
+ planMap.sprintId = taskPlanMap.sprintId
+ planMap.sprintName = taskPlanMap.sprintName
+ planMap.custRequestId = custRequestId
+ planMap.description = taskPlanMap.description
+ planMap.productId = productlist[0].productId
+ planMap.productName = productName
+ taskPartyList.add(planMap)
+ taskListDropdown.add(planMap)
}
}
}
if (taskPartyList){
- context.taskPartyList = taskPartyList;
+ context.taskPartyList = taskPartyList
}
if (taskListDropdown){
- context.taskListDropdown = taskListDropdown;
+ context.taskListDropdown = taskListDropdown
}
Modified: ofbiz/trunk/specialpurpose/webpos/groovyScripts/Login.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/groovyScripts/Login.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/groovyScripts/Login.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/groovyScripts/Login.groovy Wed Nov 2 19:09:13 2016
@@ -17,30 +17,30 @@
* under the License.
*/
-import org.apache.ofbiz.product.store.ProductStoreWorker;
-import org.apache.ofbiz.webapp.control.LoginWorker;
+import org.apache.ofbiz.product.store.ProductStoreWorker
+import org.apache.ofbiz.webapp.control.LoginWorker
-context.autoUserLogin = session.getAttribute("autoUserLogin");
-context.autoLogoutUrl = LoginWorker.makeLoginUrl(request, "autoLogout");
+context.autoUserLogin = session.getAttribute("autoUserLogin")
+context.autoLogoutUrl = LoginWorker.makeLoginUrl(request, "autoLogout")
-previousParams = session.getAttribute("_PREVIOUS_PARAMS_");
+previousParams = session.getAttribute("_PREVIOUS_PARAMS_")
if (previousParams) {
- previousParams = UtilHttp.stripNamedParamsFromQueryString(previousParams, ['USERNAME', 'PASSWORD']);
- previousParams = "?" + previousParams;
+ previousParams = UtilHttp.stripNamedParamsFromQueryString(previousParams, ['USERNAME', 'PASSWORD'])
+ previousParams = "?" + previousParams
} else {
- previousParams = "";
+ previousParams = ""
}
-context.previousParams = previousParams;
+context.previousParams = previousParams
-productStoreId = ProductStoreWorker.getProductStoreId(request);
-productStore = ProductStoreWorker.getProductStore(productStoreId, delegator);
+productStoreId = ProductStoreWorker.getProductStoreId(request)
+productStore = ProductStoreWorker.getProductStore(productStoreId, delegator)
if (productStore) {
- facilityId = productStore.getString("inventoryFacilityId");
+ facilityId = productStore.getString("inventoryFacilityId")
if (facilityId) {
- context.posTerminals = from("PosTerminal").where("facilityId", facilityId).orderBy("posTerminalId").queryList();
+ context.posTerminals = from("PosTerminal").where("facilityId", facilityId).orderBy("posTerminalId").queryList()
} else {
- context.posTerminals = from("PosTerminal").orderBy("posTerminalId").queryList();
+ context.posTerminals = from("PosTerminal").orderBy("posTerminalId").queryList()
}
}
Modified: ofbiz/trunk/specialpurpose/webpos/groovyScripts/WebPosMenus.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/groovyScripts/WebPosMenus.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/groovyScripts/WebPosMenus.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/groovyScripts/WebPosMenus.groovy Wed Nov 2 19:09:13 2016
@@ -17,22 +17,22 @@
* under the License.
*/
-import org.apache.ofbiz.webpos.WebPosEvents;
-import org.apache.ofbiz.webpos.session.WebPosSession;
-import org.apache.ofbiz.webpos.transaction.WebPosTransaction;
+import org.apache.ofbiz.webpos.WebPosEvents
+import org.apache.ofbiz.webpos.session.WebPosSession
+import org.apache.ofbiz.webpos.transaction.WebPosTransaction
-webPosSession = WebPosEvents.getWebPosSession(request, null);
+webPosSession = WebPosEvents.getWebPosSession(request, null)
if (webPosSession) {
- context.shoppingCartSize = webPosSession.getCart().size();
- context.isManagerLoggedIn = webPosSession.isManagerLoggedIn();
- webPosTransaction = webPosSession.getCurrentTransaction();
+ context.shoppingCartSize = webPosSession.getCart().size()
+ context.isManagerLoggedIn = webPosSession.isManagerLoggedIn()
+ webPosTransaction = webPosSession.getCurrentTransaction()
if (webPosTransaction) {
- context.isOpen = webPosTransaction.isOpen();
+ context.isOpen = webPosTransaction.isOpen()
}
- context.cart = webPosSession.getCart();
- context.totalDue = webPosSession.getCurrentTransaction().getTotalDue();
- context.totalPayments = webPosSession.getCurrentTransaction().getPaymentTotal();
+ context.cart = webPosSession.getCart()
+ context.totalDue = webPosSession.getCurrentTransaction().getTotalDue()
+ context.totalPayments = webPosSession.getCurrentTransaction().getPaymentTotal()
} else {
- context.shoppingCartSize = 0;
+ context.shoppingCartSize = 0
}
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/webpos/groovyScripts/WebPosSetup.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/groovyScripts/WebPosSetup.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/groovyScripts/WebPosSetup.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/groovyScripts/WebPosSetup.groovy Wed Nov 2 19:09:13 2016
@@ -17,24 +17,24 @@
* under the License.
*/
-import org.apache.ofbiz.product.catalog.CatalogWorker;
-import org.apache.ofbiz.product.store.ProductStoreWorker;
-import org.apache.ofbiz.webapp.control.LoginWorker;
+import org.apache.ofbiz.product.catalog.CatalogWorker
+import org.apache.ofbiz.product.store.ProductStoreWorker
+import org.apache.ofbiz.webapp.control.LoginWorker
-productStore = ProductStoreWorker.getProductStore(request);
+productStore = ProductStoreWorker.getProductStore(request)
-prodCatalog = CatalogWorker.getProdCatalog(request);
+prodCatalog = CatalogWorker.getProdCatalog(request)
if (prodCatalog) {
- catalogStyleSheet = prodCatalog.styleSheet;
+ catalogStyleSheet = prodCatalog.styleSheet
if (catalogStyleSheet) {
- globalContext.catalogStyleSheet = catalogStyleSheet;
+ globalContext.catalogStyleSheet = catalogStyleSheet
}
- catalogHeaderLogo = prodCatalog.headerLogo;
+ catalogHeaderLogo = prodCatalog.headerLogo
if (catalogHeaderLogo) {
- globalContext.catalogHeaderLogo = catalogHeaderLogo;
+ globalContext.catalogHeaderLogo = catalogHeaderLogo
}
}
-globalContext.productStore = productStore;
-globalContext.checkLoginUrl = LoginWorker.makeLoginUrl(request, "checkLogin");
-globalContext.catalogQuickaddUse = CatalogWorker.getCatalogQuickaddUse(request);
+globalContext.productStore = productStore
+globalContext.checkLoginUrl = LoginWorker.makeLoginUrl(request, "checkLogin")
+globalContext.catalogQuickaddUse = CatalogWorker.getCatalogQuickaddUse(request)
Modified: ofbiz/trunk/specialpurpose/webpos/groovyScripts/catalog/Category.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/groovyScripts/catalog/Category.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/groovyScripts/catalog/Category.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/groovyScripts/catalog/Category.groovy Wed Nov 2 19:09:13 2016
@@ -22,41 +22,41 @@
* should not contain order component's specific code.
*/
-import org.apache.ofbiz.product.catalog.CatalogWorker;
-import org.apache.ofbiz.product.category.CategoryContentWrapper;
+import org.apache.ofbiz.product.catalog.CatalogWorker
+import org.apache.ofbiz.product.category.CategoryContentWrapper
-detailScreen = "categorydetail";
-catalogName = CatalogWorker.getCatalogName(request);
+detailScreen = "categorydetail"
+catalogName = CatalogWorker.getCatalogName(request)
-productCategoryId = parameters.productCategoryId;
+productCategoryId = parameters.productCategoryId
if (!(productCategoryId) && request.getAttribute("topCategoryId")) {
- productCategoryId = request.getAttribute("topCategoryId");
+ productCategoryId = request.getAttribute("topCategoryId")
}
-category = from("ProductCategory").where("productCategoryId", productCategoryId).cache(true).queryOne();
+category = from("ProductCategory").where("productCategoryId", productCategoryId).cache(true).queryOne()
if (category) {
if (category.detailScreen) {
- detailScreen = category.detailScreen;
+ detailScreen = category.detailScreen
}
- categoryContentWrapper = new CategoryContentWrapper(category, request);
- context.title = categoryContentWrapper.get("CATEGORY_NAME", "html");
- categoryDescription = categoryContentWrapper.get("DESCRIPTION", "html");
+ categoryContentWrapper = new CategoryContentWrapper(category, request)
+ context.title = categoryContentWrapper.get("CATEGORY_NAME", "html")
+ categoryDescription = categoryContentWrapper.get("DESCRIPTION", "html")
if (categoryDescription) {
- context.metaDescription = categoryDescription;
- context.metaKeywords = categoryDescription + ", " + catalogName;
+ context.metaDescription = categoryDescription
+ context.metaKeywords = categoryDescription + ", " + catalogName
} else {
- context.metaKeywords = catalogName;
+ context.metaKeywords = catalogName
}
- context.productCategory = category;
+ context.productCategory = category
}
// check the catalogs template path and update
-templatePathPrefix = CatalogWorker.getTemplatePathPrefix(request);
+templatePathPrefix = CatalogWorker.getTemplatePathPrefix(request)
if (templatePathPrefix) {
- detailScreen = templatePathPrefix + detailScreen;
+ detailScreen = templatePathPrefix + detailScreen
}
-context.detailScreen = detailScreen;
+context.detailScreen = detailScreen
-request.setAttribute("productCategoryId", productCategoryId);
-request.setAttribute("defaultViewSize", 10);
-request.setAttribute("limitView", true);
+request.setAttribute("productCategoryId", productCategoryId)
+request.setAttribute("defaultViewSize", 10)
+request.setAttribute("limitView", true)
Modified: ofbiz/trunk/specialpurpose/webpos/groovyScripts/catalog/SideDeepCategory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/groovyScripts/catalog/SideDeepCategory.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/groovyScripts/catalog/SideDeepCategory.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/groovyScripts/catalog/SideDeepCategory.groovy Wed Nov 2 19:09:13 2016
@@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.ofbiz.product.catalog.CatalogWorker;
-import org.apache.ofbiz.product.category.CategoryWorker;
+import org.apache.ofbiz.product.catalog.CatalogWorker
+import org.apache.ofbiz.product.category.CategoryWorker
-CategoryWorker.getRelatedCategories(request, "topLevelList", CatalogWorker.getCatalogTopCategoryId(request, CatalogWorker.getCurrentCatalogId(request)), true);
-curCategoryId = parameters.category_id ?: parameters.CATEGORY_ID ?: "";
-request.setAttribute("curCategoryId", curCategoryId);
-CategoryWorker.setTrail(request, curCategoryId);
+CategoryWorker.getRelatedCategories(request, "topLevelList", CatalogWorker.getCatalogTopCategoryId(request, CatalogWorker.getCurrentCatalogId(request)), true)
+curCategoryId = parameters.category_id ?: parameters.CATEGORY_ID ?: ""
+request.setAttribute("curCategoryId", curCategoryId)
+CategoryWorker.setTrail(request, curCategoryId)
-categoryList = request.getAttribute("topLevelList");
+categoryList = request.getAttribute("topLevelList")
if (categoryList) {
- catContentWrappers = [:];
- CategoryWorker.getCategoryContentWrappers(catContentWrappers, categoryList, request);
- context.catContentWrappers = catContentWrappers;
+ catContentWrappers = [:]
+ CategoryWorker.getCategoryContentWrappers(catContentWrappers, categoryList, request)
+ context.catContentWrappers = catContentWrappers
}
if (!curCategoryId && categoryList) {
- curCategoryId = categoryList[0].productCategoryId;
- request.setAttribute("topCategoryId", curCategoryId);
+ curCategoryId = categoryList[0].productCategoryId
+ request.setAttribute("topCategoryId", curCategoryId)
}
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/webpos/groovyScripts/customer/EditAddress.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/groovyScripts/customer/EditAddress.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/groovyScripts/customer/EditAddress.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/groovyScripts/customer/EditAddress.groovy Wed Nov 2 19:09:13 2016
@@ -17,34 +17,34 @@
* under the License.
*/
-person = from("Person").where("partyId", parameters.partyId).queryOne();
+person = from("Person").where("partyId", parameters.partyId).queryOne()
if (person) {
- request.setAttribute("lastName", person.lastName);
- request.setAttribute("firstName", person.firstName);
- request.setAttribute("partyId", parameters.partyId);
+ request.setAttribute("lastName", person.lastName)
+ request.setAttribute("firstName", person.firstName)
+ request.setAttribute("partyId", parameters.partyId)
}
-contactMech = from("ContactMech").where("contactMechId", parameters.contactMechId).queryOne();
+contactMech = from("ContactMech").where("contactMechId", parameters.contactMechId).queryOne()
if (contactMech) {
- postalAddress = contactMech.getRelatedOne("PostalAddress", false);
+ postalAddress = contactMech.getRelatedOne("PostalAddress", false)
if (postalAddress) {
- request.setAttribute("contactMechId", postalAddress.contactMechId);
- request.setAttribute("toName", postalAddress.toName);
- request.setAttribute("attnName", postalAddress.attnName);
- request.setAttribute("address1", postalAddress.address1);
- request.setAttribute("address2", postalAddress.address2);
- request.setAttribute("city", postalAddress.city);
- request.setAttribute("postalCode", postalAddress.postalCode);
- request.setAttribute("stateProvinceGeoId", postalAddress.stateProvinceGeoId);
- request.setAttribute("countryGeoId", postalAddress.countryGeoId);
- stateProvinceGeo = from("Geo").where("geoId", postalAddress.stateProvinceGeoId).queryOne();
+ request.setAttribute("contactMechId", postalAddress.contactMechId)
+ request.setAttribute("toName", postalAddress.toName)
+ request.setAttribute("attnName", postalAddress.attnName)
+ request.setAttribute("address1", postalAddress.address1)
+ request.setAttribute("address2", postalAddress.address2)
+ request.setAttribute("city", postalAddress.city)
+ request.setAttribute("postalCode", postalAddress.postalCode)
+ request.setAttribute("stateProvinceGeoId", postalAddress.stateProvinceGeoId)
+ request.setAttribute("countryGeoId", postalAddress.countryGeoId)
+ stateProvinceGeo = from("Geo").where("geoId", postalAddress.stateProvinceGeoId).queryOne()
if (stateProvinceGeo) {
- request.setAttribute("stateProvinceGeo", stateProvinceGeo.get("geoName", locale));
+ request.setAttribute("stateProvinceGeo", stateProvinceGeo.get("geoName", locale))
}
- countryProvinceGeo = from("Geo").where("geoId", postalAddress.countryGeoId).queryOne();
+ countryProvinceGeo = from("Geo").where("geoId", postalAddress.countryGeoId).queryOne()
if (countryProvinceGeo) {
- request.setAttribute("countryProvinceGeo", countryProvinceGeo.get("geoName", locale));
+ request.setAttribute("countryProvinceGeo", countryProvinceGeo.get("geoName", locale))
}
}
}
-request.setAttribute("contactMechPurposeTypeId", parameters.contactMechPurposeTypeId);
+request.setAttribute("contactMechPurposeTypeId", parameters.contactMechPurposeTypeId)
Modified: ofbiz/trunk/specialpurpose/webpos/groovyScripts/manager/PaidOutAndIn.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/groovyScripts/manager/PaidOutAndIn.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/groovyScripts/manager/PaidOutAndIn.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/groovyScripts/manager/PaidOutAndIn.groovy Wed Nov 2 19:09:13 2016
@@ -17,5 +17,5 @@
* under the License.
*/
-context.paidReasonIn = from("Enumeration").where("enumTypeId", "POS_PAID_REASON_IN").orderBy("sequenceId").queryList();
-context.paidReasonOut = from("Enumeration").where("enumTypeId", "POS_PAID_REASON_OUT").orderBy("sequenceId").queryList();
+context.paidReasonIn = from("Enumeration").where("enumTypeId", "POS_PAID_REASON_IN").orderBy("sequenceId").queryList()
+context.paidReasonOut = from("Enumeration").where("enumTypeId", "POS_PAID_REASON_OUT").orderBy("sequenceId").queryList()
Modified: ofbiz/trunk/specialpurpose/webpos/groovyScripts/search/CustomerAddress.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/groovyScripts/search/CustomerAddress.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/groovyScripts/search/CustomerAddress.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/groovyScripts/search/CustomerAddress.groovy Wed Nov 2 19:09:13 2016
@@ -16,32 +16,32 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.ofbiz.base.util.UtilValidate;
-import org.apache.ofbiz.webpos.WebPosEvents;
+import org.apache.ofbiz.base.util.UtilValidate
+import org.apache.ofbiz.webpos.WebPosEvents
-webPosSession = WebPosEvents.getWebPosSession(request, null);
+webPosSession = WebPosEvents.getWebPosSession(request, null)
if (webPosSession) {
- shoppingCart = webPosSession.getCart();
- shipToCustomerPartyId = shoppingCart.getShipToCustomerPartyId();
+ shoppingCart = webPosSession.getCart()
+ shipToCustomerPartyId = shoppingCart.getShipToCustomerPartyId()
if (UtilValidate.isNotEmpty(shipToCustomerPartyId)) {
- context.personShipTo = from("Person").where("partyId", shipToCustomerPartyId).queryOne();
+ context.personShipTo = from("Person").where("partyId", shipToCustomerPartyId).queryOne()
}
- shippingContactMechId = shoppingCart.getContactMech("SHIPPING_LOCATION");
+ shippingContactMechId = shoppingCart.getContactMech("SHIPPING_LOCATION")
if (UtilValidate.isNotEmpty(shippingContactMechId)) {
- contactMech = from("ContactMech").where("contactMechId", shippingContactMechId).queryOne();
+ contactMech = from("ContactMech").where("contactMechId", shippingContactMechId).queryOne()
if (UtilValidate.isNotEmpty(contactMech) && "POSTAL_ADDRESS".equals(contactMech.contactMechTypeId)) {
- context.shippingPostalAddress = contactMech.getRelatedOne("PostalAddress", false);
+ context.shippingPostalAddress = contactMech.getRelatedOne("PostalAddress", false)
}
}
- billToCustomerPartyId = shoppingCart.getBillToCustomerPartyId();
+ billToCustomerPartyId = shoppingCart.getBillToCustomerPartyId()
if (UtilValidate.isNotEmpty(billToCustomerPartyId)) {
- context.personBillTo = from("Person").where("partyId", billToCustomerPartyId).queryOne();
+ context.personBillTo = from("Person").where("partyId", billToCustomerPartyId).queryOne()
}
- billingContactMechId = shoppingCart.getContactMech("BILLING_LOCATION");
+ billingContactMechId = shoppingCart.getContactMech("BILLING_LOCATION")
if (UtilValidate.isNotEmpty(billingContactMechId)) {
- contactMech = from("ContactMech").where("contactMechId", billingContactMechId).queryOne();
+ contactMech = from("ContactMech").where("contactMechId", billingContactMechId).queryOne()
if (UtilValidate.isNotEmpty(contactMech) && "POSTAL_ADDRESS".equals(contactMech.contactMechTypeId)) {
- context.billingPostalAddress = contactMech.getRelatedOne("PostalAddress", false);
+ context.billingPostalAddress = contactMech.getRelatedOne("PostalAddress", false)
}
}
}
Modified: ofbiz/trunk/specialpurpose/webpos/groovyScripts/search/SearchSalesReps.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/groovyScripts/search/SearchSalesReps.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/groovyScripts/search/SearchSalesReps.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/groovyScripts/search/SearchSalesReps.groovy Wed Nov 2 19:09:13 2016
@@ -17,9 +17,9 @@
* under the License.
*/
-context.salesReps = from("PartyRoleNameDetail").where("roleTypeId", "SALES_REP").orderBy("lastName", "firstName").queryList();
+context.salesReps = from("PartyRoleNameDetail").where("roleTypeId", "SALES_REP").orderBy("lastName", "firstName").queryList()
-shoppingCart = session.getAttribute("shoppingCart");
+shoppingCart = session.getAttribute("shoppingCart")
if (shoppingCart) {
- context.cartSalesReps = shoppingCart.getAdditionalPartyRoleMap().SALES_REP;
+ context.cartSalesReps = shoppingCart.getAdditionalPartyRoleMap().SALES_REP
}
\ No newline at end of file