svn commit: r1044227 - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r1044227 - in /ofbiz/trunk: applications/accounting/webapp
 
|
Author: doogie
Date: Fri Dec 10 07:20:25 2010 New Revision: 1044227 URL: http://svn.apache.org/viewvc?rev=1044227&view=rev Log: Remove some trailing whitespace from lines; only doing files that will be modified by soon to be committed changesets. Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl Fri Dec 10 07:20:25 2010 @@ -21,7 +21,7 @@ under the License. <input name="_useRowSubmit" type="hidden" value="Y"/> <input name="finAccountId" type="hidden" value="${finAccountId}"/> <input name="glReconciliationId" type="hidden" value="${glReconciliationId}"/> - <div class="screenlet"> + <div class="screenlet"> <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.AccountingCurrentBankReconciliation}</li> @@ -43,7 +43,7 @@ under the License. <#if currentGlReconciliation.statusId?exists> <tr> <td><span class="label">${uiLabelMap.CommonStatus}</span></td> - <#assign currentStatus = currentGlReconciliation.getRelatedOneCache("StatusItem")> + <#assign currentStatus = currentGlReconciliation.getRelatedOneCache("StatusItem")> <td>${currentStatus.description?if_exists}</td> </tr> </#if> @@ -71,7 +71,7 @@ under the License. </#if> </div> </div> - <div class="screenlet"> + <div class="screenlet"> <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.AccountingPreviousBankReconciliation}</li> @@ -88,7 +88,7 @@ under the License. <#if previousGlReconciliation.statusId?exists> <tr> <td><span class="label">${uiLabelMap.CommonStatus}</span></td> - <#assign previousStatus = previousGlReconciliation.getRelatedOneCache("StatusItem")> + <#assign previousStatus = previousGlReconciliation.getRelatedOneCache("StatusItem")> <td>${previousStatus.description?if_exists}</td> </tr> </#if> @@ -116,7 +116,7 @@ under the License. </#if> </div> </div> - <div class="screenlet"> + <div class="screenlet"> <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.AccountingFinAcctTransAssociatedToGlReconciliation}</li> @@ -208,7 +208,7 @@ under the License. </#if> </div> <div class="right"> - <span class="label">${uiLabelMap.AccountingTotalCapital} </span><@ofbizCurrency amount=transactionTotalAmount.grandTotal isoCode=defaultOrganizationPartyCurrencyUomId/> + <span class="label">${uiLabelMap.AccountingTotalCapital} </span><@ofbizCurrency amount=transactionTotalAmount.grandTotal isoCode=defaultOrganizationPartyCurrencyUomId/> <#if isReconciled == false> <input type="submit" value="${uiLabelMap.AccountingReconcile}"/> </#if> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl Fri Dec 10 07:20:25 2010 @@ -86,7 +86,7 @@ under the License. <#list acctgTransList as acctgTrans> <fo:table-row> <fo:table-cell border="1pt solid" border-width=".1mm"> - <fo:block text-align="center" font-size="5pt">${(acctgTrans.acctgTransId)!}</fo:block> + <fo:block text-align="center" font-size="5pt">${(acctgTrans.acctgTransId)!}</fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="5pt"> @@ -101,7 +101,7 @@ under the License. <#assign acctgTransType = (delegator.findOne("AcctgTransType", {"acctgTransTypeId" : (acctgTrans.acctgTransTypeId)!}, false))!/> <#if acctgTransType?has_content>${acctgTransType.description}</#if> </#if> - </fo:block> + </fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="5pt"> @@ -114,7 +114,7 @@ under the License. <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="5pt"> ${(acctgTrans.invoiceId)!} - </fo:block> + </fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="5pt"> @@ -122,22 +122,22 @@ under the License. <#assign paymentType = (delegator.findOne("Payment", {"paymentId" : (acctgTrans.paymentId)!}, false)).getRelatedOne("PaymentType")/> ${(acctgTrans.paymentId)!}<#if (paymentType?has_content)> -(${(paymentType.description)!})</#if> </#if> - </fo:block> + </fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="5pt"> ${(acctgTrans.workEffortId)!} - </fo:block> + </fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="5pt"> ${(acctgTrans.shipmentId)!} - </fo:block> + </fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="5pt"> ${(acctgTrans.isPosted)!} - </fo:block> + </fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="5pt"> Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Fri Dec 10 07:20:25 2010 @@ -358,7 +358,7 @@ public class ProductionRunServices { } catch (GenericServiceException e) { Debug.logError(e, "Problem calling the createWorkEffortAssoc service", module); } - + // clone associated objects from the routing task to the run task String routingTaskId = routingTaskAssoc.getString("workEffortIdTo"); cloneWorkEffortPartyAssignments(ctx, userLogin, routingTaskId, productionRunTaskId); @@ -451,7 +451,7 @@ public class ProductionRunServices { } } } - + /** * Make a copy of the cost calc entities that were defined on the template routing task to the new production run task. */ @@ -463,7 +463,7 @@ public class ProductionRunServices { } catch (GenericEntityException e) { Debug.logError(e.getMessage(), module); } - + if (workEffortCostCalcs != null) { for (GenericValue costCalc : workEffortCostCalcs) { Map<String, Object> createCostCalc = UtilMisc.toMap( @@ -484,7 +484,7 @@ public class ProductionRunServices { } } } - + /** * Update a Production Run. * <li> update field and after recalculate the entire ProductionRun data (routingTask and productComponent) @@ -1081,9 +1081,9 @@ public class ProductionRunServices { if (UtilValidate.isNotEmpty(routingTaskAssoc)) { routingTask = routingTaskAssoc.getRelatedOne("FromWorkEffort"); } - + // Get all the valid CostComponentCalc entries - List workEffortCostCalcs = workEffortCostCalcs = delegator.findByAnd("WorkEffortCostCalc", UtilMisc.toMap("workEffortId", productionRunTaskId)); + List workEffortCostCalcs = workEffortCostCalcs = delegator.findByAnd("WorkEffortCostCalc", UtilMisc.toMap("workEffortId", productionRunTaskId)); workEffortCostCalcs = EntityUtil.filterByDate(workEffortCostCalcs); Iterator workEffortCostCalcsIt = workEffortCostCalcs.iterator(); @@ -1125,7 +1125,7 @@ public class ProductionRunServices { dispatcher.runSync(customMethod.getString("customMethodName"), inMap); } } - + // Now get the cost information associated to the fixed asset and compute the costs GenericValue fixedAsset = workEffort.getRelatedOne("FixedAsset"); if (UtilValidate.isEmpty(fixedAsset) && UtilValidate.isNotEmpty(routingTask)) { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java Fri Dec 10 07:20:25 2010 @@ -215,10 +215,10 @@ public class RequirementServices { GenericValue item = (GenericValue) iter.next(); GenericValue product = item.getRelatedOne("Product"); if (product == null) continue; - if ((!"PRODRQM_AUTO".equals(product.get("requirementMethodEnumId")) && + if ((!"PRODRQM_AUTO".equals(product.get("requirementMethodEnumId")) && !"PRODRQM_AUTO".equals(productStore.get("requirementMethodEnumId"))) || - (product.get("requirementMethodEnumId") == null && - !"PRODRQM_AUTO".equals(productStore.get("requirementMethodEnumId")))) continue; + (product.get("requirementMethodEnumId") == null && + !"PRODRQM_AUTO".equals(productStore.get("requirementMethodEnumId")))) continue; BigDecimal quantity = item.getBigDecimal("quantity"); BigDecimal cancelQuantity = item.getBigDecimal("cancelQuantity"); BigDecimal required = quantity.subtract(cancelQuantity == null ? BigDecimal.ZERO : cancelQuantity); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Fri Dec 10 07:20:25 2010 @@ -1216,7 +1216,7 @@ public class ProductPromoWorker { protected static boolean checkConditionsForItem(GenericValue productPromoActionOrCond, ShoppingCart cart, ShoppingCartItem cartItem, Delegator delegator, LocalDispatcher dispatcher, Timestamp nowTimestamp) throws GenericEntityException { GenericValue productPromoRule = productPromoActionOrCond.getRelatedOneCache("ProductPromoRule"); - + List<GenericValue> productPromoConds = delegator.findByAndCache("ProductPromoCond", UtilMisc.toMap("productPromoId", productPromoRule.get("productPromoId")), UtilMisc.toList("productPromoCondSeqId")); productPromoConds = EntityUtil.filterByAnd(productPromoConds, UtilMisc.toMap("productPromoRuleId", productPromoRule.get("productPromoRuleId"))); for (GenericValue productPromoCond: productPromoConds) { @@ -1233,26 +1233,26 @@ public class ProductPromoWorker { String operatorEnumId = productPromoCond.getString("operatorEnumId"); // don't get list price from cart because it may have tax included whereas the base price does not: BigDecimal listPrice = cartItem.getListPrice(); - Map<String, String> priceFindMap = UtilMisc.toMap("productId", cartItem.getProductId(), + Map<String, String> priceFindMap = UtilMisc.toMap("productId", cartItem.getProductId(), "productPriceTypeId", "LIST_PRICE", "productPricePurposeId", "PURCHASE"); List<GenericValue> listProductPriceList = delegator.findByAnd("ProductPrice", priceFindMap, UtilMisc.toList("-fromDate")); listProductPriceList = EntityUtil.filterByDate(listProductPriceList, true); GenericValue listProductPrice = (listProductPriceList != null && listProductPriceList.size() > 0) ? listProductPriceList.get(0): null; BigDecimal listPrice = (listProductPrice != null) ? listProductPrice.getBigDecimal("price") : null; - + if (listPrice == null) { // can't find a list price so this condition is meaningless, consider it passed return true; } - + BigDecimal basePrice = cartItem.getBasePrice(); BigDecimal amountOff = listPrice.subtract(basePrice); BigDecimal percentOff = amountOff.divide(listPrice, 2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100L)); - + BigDecimal condValueBigDecimal = new BigDecimal(condValue); Integer compareBase = null; - + if ("PPIP_LPMUP_AMT".equals(inputParamEnumId)) { compareBase = Integer.valueOf(amountOff.compareTo(condValueBigDecimal)); } else if ("PPIP_LPMUP_PER".equals(inputParamEnumId)) { @@ -1301,7 +1301,7 @@ public class ProductPromoWorker { if (0 == checkConditionPartyHierarchy(delegator, nowTimestamp, groupPartyId, partyIdFrom)) { return 0; } - } + } return 1; } Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy Fri Dec 10 07:20:25 2010 @@ -87,14 +87,14 @@ if ("SALES_ORDER".equals(cart.getOrderTy facilityMaps = FastList.newInstance(); facilities = delegator.findByAndCache("Facility", [ownerPartyId : companyId]); - // if facilites is null then check the PartyRelationship where there is a relationship set for Parent & Child organization. Then also fetch the value of companyId from there. + // if facilites is null then check the PartyRelationship where there is a relationship set for Parent & Child organization. Then also fetch the value of companyId from there. if (UtilValidate.isEmpty(facilities)) { partyRelationship = EntityUtil.getFirst(delegator.findList("PartyRelationship", EntityCondition.makeCondition(["roleTypeIdFrom": "PARENT_ORGANIZATION", "partyIdTo": companyId]), null, null, null, false)); if (UtilValidate.isNotEmpty(partyRelationship)) { companyId = partyRelationship.partyIdFrom; facilities = delegator.findByAndCache("Facility", [ownerPartyId : companyId]); } - } + } facilities.each { facility -> facilityMap = FastMap.newInstance(); facilityContactMechValueMaps = ContactMechWorker.getFacilityContactMechValueMaps(delegator, facility.facilityId, false, null); Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy Fri Dec 10 07:20:25 2010 @@ -38,7 +38,7 @@ if (productId != null) { String productIdTo = product.getString("productIdTo"); prodAssocRecord = delegator.findByAnd("Product", [productId : productIdTo]); productList.add(EntityUtil.getFirst(prodAssocRecord)); - } + } } context.put("productList",productList); } Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Fri Dec 10 07:20:25 2010 @@ -157,10 +157,10 @@ if (selPhones) { context.phone = delegator.findByPrimaryKey("TelecomNumber", [contactMechId : selPhones[0].contactMechId]); } -// Fax +// Fax faxNumbers = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "FAX_NUMBER"]); faxNumbers = EntityUtil.filterByDate(faxNumbers, nowTimestamp, null, null, true); -if (faxNumbers) { +if (faxNumbers) { context.fax = delegator.findOne("TelecomNumber", [contactMechId : faxNumbers[0].contactMechId], false); } Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Fri Dec 10 07:20:25 2010 @@ -60,7 +60,7 @@ if (orderId) { orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); } -if (orderHeader) { +if (orderHeader) { // note these are overridden in the OrderViewWebSecure.groovy script if run context.hasPermission = true; context.canViewInternalDetails = true; @@ -116,7 +116,7 @@ if (orderHeader) { canceledPromoOrderItem = [:]; orderItemList = orderReadHelper.getOrderItems(); - orderItemList.each { orderItem -> + orderItemList.each { orderItem -> if("Y".equals(orderItem.get("isPromo")) && "ITEM_CANCELLED".equals(orderItem.get("statusId"))) { canceledPromoOrderItem = orderItem; } @@ -441,7 +441,7 @@ if (orderItems) { // This case comes when order's shipping amount is more then or less than default percentage (defined in shipment.properties) of online UPS shipping amount. condn = EntityCondition.makeCondition([ - EntityCondition.makeCondition("primaryOrderId", EntityOperator.EQUALS, orderId), + EntityCondition.makeCondition("primaryOrderId", EntityOperator.EQUALS, orderId), EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "SHIPMENT_PICKED")], EntityOperator.AND); shipments = delegator.findList("Shipment", condn, null, null, null, false); @@ -473,7 +473,7 @@ if (orderItems) { } } } - + // get orderAdjustmentId for SHIPPING_CHARGES orderAdjustmentId = null; orderAdjustments.each { orderAdjustment -> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Fri Dec 10 07:20:25 2010 @@ -325,7 +325,7 @@ function toggleOrderIdList() { </#if> <option value="">${uiLabelMap.OrderSelectShippingMethod}</option> <#list carrierShipmentMethods as carrierShipmentMethod> - <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType")> + <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType")> <option value="${carrierShipmentMethod.partyId}@${carrierShipmentMethod.shipmentMethodTypeId}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.description?if_exists}</option> </#list> </select> @@ -454,7 +454,7 @@ function toggleOrderIdList() { <#assign includeCountry = requestParameters.includeCountry> <option value="${includeCountry}"><#if "Y" == includeCountry>${uiLabelMap.OrderOnlyInclude}<#elseif "N" == includeCountry>${uiLabelMap.OrderDoNotInclude}</#if></option> <option value="${includeCountry}">---</option> - </#if> + </#if> <option value="Y">${uiLabelMap.OrderOnlyInclude}</option> <option value="N">${uiLabelMap.OrderDoNotInclude}</option> </select> Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java Fri Dec 10 07:20:25 2010 @@ -229,7 +229,7 @@ public class EbayStore { return outputBuilder.toString(); } - /* add/update/delete categories and child into your ebay store category */ + /* add/update/delete categories and child into your ebay store category */ public static Map<String,Object> exportCategoriesSelectedToEbayStore(DispatchContext dctx, Map<String,? extends Object> context) { Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); @@ -304,7 +304,7 @@ public class EbayStore { childCategoryType.setName(productCategory.getString("categoryName")); listEdit.add(childCategoryType); } - } + } } if (listAdd.size() > 0) { req = new SetStoreCategoriesRequestType(); @@ -391,7 +391,7 @@ public class EbayStore { } catch (Exception e) { Debug.logError(e.getMessage(), module); } - return storeCustomCategoryTypeArry; + return storeCustomCategoryTypeArry; } public static Map<String, Object> excuteExportCategoryToEbayStore(SetStoreCategoriesCall call, SetStoreCategoriesRequestType req, StoreCategoryUpdateActionCodeType actionCode,Delegator delegator, String partyId,List<GenericValue> catalogCategories) { @@ -634,7 +634,7 @@ public class EbayStore { String productStoreId = (String) context.get("productStoreId"); List itemsResult = FastList.newInstance(); try { - List productStores = delegator.findByAnd("ProductStoreRole", UtilMisc.toMap("productStoreId", productStoreId, "roleTypeId", "EBAY_ACCOUNT")); + List productStores = delegator.findByAnd("ProductStoreRole", UtilMisc.toMap("productStoreId", productStoreId, "roleTypeId", "EBAY_ACCOUNT")); if (productStores.size() != 0) { String partyId = ((GenericValue) productStores.get(0)).getString("partyId"); List userLoginStore = delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId", partyId)); @@ -644,7 +644,7 @@ public class EbayStore { } } } catch (Exception e) { - + } return result; } @@ -673,7 +673,7 @@ public class EbayStore { userLoginId = (String)userLogins.get(0).get("userLoginId"); password = (String)userLogins.get(0).get("currentPassword"); } - + } } catch (GenericEntityException e1) { e1.printStackTrace(); @@ -943,7 +943,7 @@ public class EbayStore { StoreColorSchemeType colorSchemeType = storeThemeType.getColorScheme(); if (colorSchemeType != null) { if (colorSchemeId.equals(colorSchemeType.getColorSchemeID().toString())) { - // get font,size and color + // get font,size and color storeColorSchemeMap = FastMap.newInstance(); StoreFontType storeFontType = colorSchemeType.getFont(); storeColorSchemeMap.put("storeFontTypeFontFaceValue", storeFontType.getNameFace().value()); @@ -1491,7 +1491,7 @@ public class EbayStore { sellingManagerSoldListings.getSellingManagerSoldListings(); SellingManagerSoldOrderType[] sellingManagerSoldOrders = sellingManagerSoldListings.getReturnedSaleRecord(); - if (UtilValidate.isNotEmpty(sellingManagerSoldOrders)) { + if (UtilValidate.isNotEmpty(sellingManagerSoldOrders)) { int soldOrderLength = sellingManagerSoldOrders.length; for (int i = 0; i < soldOrderLength; i++) { SellingManagerSoldOrderType sellingManagerSoldOrder = sellingManagerSoldOrders[i]; @@ -1527,12 +1527,12 @@ public class EbayStore { api.setDetailLevel(detailLevels); ItemType itemType = api.getItem(); String itemUrl = null; - + entry.put("SKU", itemType.getSKU()); if (UtilValidate.isNotEmpty(itemType.getReservePrice())) reservPrice = itemType.getReservePrice().getValue(); entry.put("reservePrice", reservPrice); entry.put("hitCount", itemType.getHitCount() != null ? itemType.getHitCount() : 0); - + if (itemType.getListingDetails() != null) { itemUrl = itemType.getListingDetails().getViewItemURL(); } @@ -1798,7 +1798,7 @@ public class EbayStore { Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); String productStoreId = (String) context.get("productStoreId"); - String itemID = (String) context.get("itemId"); + String itemID = (String) context.get("itemId"); ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator); try { DetailLevelCodeType[] detailLevels = new DetailLevelCodeType[] { @@ -1840,7 +1840,7 @@ public class EbayStore { Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); String productStoreId = (String) context.get("productStoreId"); - String itemID = (String) context.get("itemId"); + String itemID = (String) context.get("itemId"); ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator); try { DetailLevelCodeType[] detailLevels = new DetailLevelCodeType[] { @@ -2032,7 +2032,7 @@ public class EbayStore { int i = 0; cols.put("itemId", item.getItemID() != null ? item.getItemID() : ""); cols.put("title", item.getTitle() != null ? item.getTitle() : ""); - + SellingStatusType sst = item.getSellingStatus(); double currentPrice = 0; int bidCount = 0; @@ -2148,7 +2148,7 @@ public class EbayStore { public static Map<String, Object> getTransaction(TransactionType transaction){ Map<String, Object> cols = FastMap.newInstance(); ItemType item = transaction.getItem(); - String itemId = null; + String itemId = null; String title = null; String SKU = null; if (UtilValidate.isNotEmpty(item)) { @@ -2241,9 +2241,9 @@ public class EbayStore { cols.put("totalPrice", totalPrice); cols.put("createdDate", createdDate); cols.put("sellerPaidStatus", sellerPaidStatus); - return cols; + return cols; } - + public Map<String, Object> getEbayStoreProductItem(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object>result = FastMap.newInstance(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -2252,7 +2252,7 @@ public class EbayStore { Locale locale = (Locale) context.get("locale"); String productStoreId = (String) context.get("productStoreId"); String itemID = (String) context.get("itemId"); - + try { Map<String, Object> inMap = FastMap.newInstance(); inMap.put("productStoreId", productStoreId); @@ -2261,7 +2261,7 @@ public class EbayStore { String userID = (String) resultUser.get("userLoginId"); ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator); GetItemCall api = new GetItemCall(apiContext); - + DetailLevelCodeType[] detailLevels = new DetailLevelCodeType[] { DetailLevelCodeType.RETURN_ALL, DetailLevelCodeType.ITEM_RETURN_ATTRIBUTES, @@ -2269,13 +2269,13 @@ public class EbayStore { }; api.setDetailLevel(detailLevels); api.getItem(itemID); - + // Set item type. ItemType item = api.getReturnedItem(); String title = item.getTitle(); String description = item.getDescription(); String listingType = item.getListingType().value(); - + if (item.getPictureDetails() != null) { String url[] = item.getPictureDetails().getPictureURL(); if (url.length != 0) { @@ -2286,7 +2286,7 @@ public class EbayStore { } else { result.put("pictureURL", null); } - + result.put("title", title); result.put("description", description); AmountType amt = item.getStartPrice(); @@ -2298,7 +2298,7 @@ public class EbayStore { } return result; } - + public Map<String, Object> reviseEbayStoreProductItem(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object>result = FastMap.newInstance(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -2313,7 +2313,7 @@ public class EbayStore { String price = (String) context.get("price"); String imageFileName = (String) context.get("_imageData_fileName"); String currencyId = (String) context.get("currencyId"); - + try { Map<String, Object> inMap = FastMap.newInstance(); inMap.put("productStoreId", productStoreId); @@ -2324,19 +2324,19 @@ public class EbayStore { String sandboxEPSURL = "https://api.sandbox.ebay.com/ws/api.dll"; apiContext.setEpsServerUrl(sandboxEPSURL); ReviseItemCall api = new ReviseItemCall(apiContext); - + // Set item type. ItemType itemToBeRevised = new ItemType(); itemToBeRevised.setItemID(itemID); - + if (UtilValidate.isNotEmpty(title)) { itemToBeRevised.setTitle(title); } - + if (UtilValidate.isNotEmpty(description)) { itemToBeRevised.setDescription(description); } - + // Set startPrice value. AmountType startPrice = new AmountType(); if (UtilValidate.isNotEmpty(price)) { @@ -2344,17 +2344,17 @@ public class EbayStore { startPrice.setCurrencyID(CurrencyCodeType.valueOf(currencyId)); itemToBeRevised.setStartPrice(startPrice); } - + // Check upload image file. - if (UtilValidate.isNotEmpty(imageFileName)) { - + if (UtilValidate.isNotEmpty(imageFileName)) { + // Upload image to ofbiz path /runtime/tmp . ByteBuffer byteWrap = (ByteBuffer) context.get("imageData"); File file = new File(System.getProperty("ofbiz.home"), "runtime" + File.separator + "tmp" + File.separator + imageFileName); FileChannel wChannel = new FileOutputStream(file, false).getChannel(); wChannel.write(byteWrap); wChannel.close(); - + // Set path file picture to api and set picture details. String [] pictureFiles = {System.getProperty("ofbiz.home") + File.separator + "runtime" + File.separator + "tmp" + File.separator + imageFileName}; PictureDetailsType pictureDetails = new PictureDetailsType(); @@ -2362,7 +2362,7 @@ public class EbayStore { pictureDetails.setPhotoDisplay(PhotoDisplayCodeType.NONE); pictureDetails.setPictureSource(PictureSourceCodeType.EPS); itemToBeRevised.setPictureDetails(pictureDetails); - + api.setItemToBeRevised(itemToBeRevised); api.uploadPictures(pictureFiles, pictureDetails); FeesType fees = api.reviseItem(); @@ -2393,11 +2393,11 @@ public class EbayStore { ItemListCustomizationType itemListType = new ItemListCustomizationType(); itemListType.setInclude(Boolean.TRUE); itemListType.setSort(ItemSortTypeCodeType.ITEM_ID_DESCENDING); - + String entriesPerPage = (String) context.get("entriesPerPage"); String pageNumber = (String) context.get("pageNumber"); String listingType = (String) context.get("listingType"); - + PaginationType page = new PaginationType(); if (UtilValidate.isNotEmpty(entriesPerPage)) { page.setEntriesPerPage(Integer.valueOf(entriesPerPage)); @@ -2423,7 +2423,7 @@ public class EbayStore { getMyeBaySelling.getMyeBaySelling(); ItemType[] tempUnSoldItems = null; if (UtilValidate.isNotEmpty(getMyeBaySelling.getReturnedUnsoldList())) tempUnSoldItems = (getMyeBaySelling.getReturnedUnsoldList().getItemArray()).getItem(); - + if (UtilValidate.isNotEmpty(tempUnSoldItems)) { for (int i = 0; i < tempUnSoldItems.length; i++) { Map <String, Object> unsoldItemMap = getClosedItem(tempUnSoldItems[i]); @@ -2433,7 +2433,7 @@ public class EbayStore { } OrderTransactionType[] tempSoldItems = null; if (UtilValidate.isNotEmpty(getMyeBaySelling.getReturnedSoldList())) tempSoldItems = (getMyeBaySelling.getReturnedSoldList().getOrderTransactionArray()).getOrderTransaction(); - + if (UtilValidate.isNotEmpty(tempSoldItems)) { for(int i = 0; i < tempSoldItems.length; i++) { ItemType soldItem = tempSoldItems[i].getTransaction().getItem(); @@ -2487,7 +2487,7 @@ public class EbayStore { if(UtilValidate.isNotEmpty(tempItems.getListingType().values())) { listingType = tempItems.getListingType().value(); } - + result.put("buyItNowPrice", buyItNowPrice); result.put("hitCount", hitCount); result.put("quantity", quantity); @@ -2608,7 +2608,7 @@ public class EbayStore { SKU = item.getSKU(); buyItNowPrice = item.getBuyItNowPrice().getValue(); currency = item.getCurrency().value(); - + if(UtilValidate.isNotEmpty(item.getListingDetails())) { viewItemURL = item.getListingDetails().getViewItemURL(); } @@ -2679,7 +2679,7 @@ public class EbayStore { if (UtilValidate.isNotEmpty(transaction.getShippingDetails().getSalesTax().getSalesTaxPercent())) { salesTaxPercent = transaction.getShippingDetails().getSalesTax().getSalesTaxPercent(); } - + orderMap.put("externalId", externalId); orderMap.put("itemId", itemId); orderMap.put("title", title); @@ -2739,7 +2739,7 @@ public class EbayStore { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); dateFormat.parse(context.get("fromDate").toString()); fromDate.setTime(dateFormat.parse(context.get("fromDate").toString())); - + SimpleDateFormat dateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); dateFormat2.parse(context.get("thruDate").toString()); toDate.setTime(dateFormat.parse(context.get("thruDate").toString())); @@ -2802,7 +2802,7 @@ public class EbayStore { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); dateFormat.parse(context.get("fromDate").toString()); fromDate.setTime(dateFormat.parse(context.get("fromDate").toString())); - + SimpleDateFormat dateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); dateFormat2.parse(context.get("thruDate").toString()); toDate.setTime(dateFormat.parse(context.get("thruDate").toString())); @@ -2810,7 +2810,7 @@ public class EbayStore { toDate.setTime(UtilDateTime.nowDate()); fromDate = null; } - + GetOrdersCall getOrder = new GetOrdersCall(apiContext); DetailLevelCodeType[] detailLevels = new DetailLevelCodeType[] { DetailLevelCodeType.RETURN_ALL, @@ -2822,14 +2822,14 @@ public class EbayStore { getOrder.setCreateTimeTo(toDate); getOrder.setOrderRole(TradingRoleCodeType.SELLER); getOrder.setOrderStatus(OrderStatusCodeType.COMPLETED); - + OrderType[] orders = getOrder.getOrders(); for (int orderCount = 0; orderCount < orders.length; orderCount++) { OrderType order = orders[orderCount]; Map<String, Object> orderMap = EbayStore.getOrderHelper(order, locale); orderList.add(orderMap); } - + } catch (Exception e) { result = ServiceUtil.returnFailure(e.getMessage()); } Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java Fri Dec 10 07:20:25 2010 @@ -84,7 +84,7 @@ public class EbayStoreInventoryServices String productId = (String)context.get("productId"); String folderId = (String)context.get("folderId"); - // start upload/update products which selected to an ebay inventory + // start upload/update products which selected to an ebay inventory if (folderId != null) { GetSellingManagerInventoryCall invenCall = new GetSellingManagerInventoryCall(EbayStoreHelper.getApiContext((String)context.get("productStoreId"), locale, delegator)); invenReq = new GetSellingManagerInventoryRequestType(); @@ -125,7 +125,7 @@ public class EbayStoreInventoryServices result = ServiceUtil.returnFailure(e.getMessage()); } catch (GenericEntityException e) { result = ServiceUtil.returnFailure(e.getMessage()); - } + } result.put("productStoreId", context.get("productStoreId")); result.put("facilityId", context.get("facilityId")); result.put("folderId", context.get("folderId")); @@ -155,7 +155,7 @@ public class EbayStoreInventoryServices //Must keep productId in SKU NUMBER because ebay allow productId field only long value. sellingManagerProductDetailsType.setCustomLabel(productId); if (ebayProductStoreInventory!=null) sellingManagerProductDetailsType.setQuantityAvailable(ebayProductStoreInventory.getBigDecimal("availableToPromiseListing").intValue()); - + productReq.setSellingManagerProductDetails(sellingManagerProductDetailsType); productResp = (AddSellingManagerProductResponseType) productCall.execute(productReq); if (productResp != null && "SUCCESS".equals(productResp.getAck().toString())) { @@ -208,7 +208,7 @@ public class EbayStoreInventoryServices sellingManagerProductDetailsType.setProductID(ebayProductId); sellingManagerProductDetailsType.setProductName((delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId))).getString("internalName")); - //Must keep productId in SKU NUMBER because ebay allow productId field only long value. + //Must keep productId in SKU NUMBER because ebay allow productId field only long value. sellingManagerProductDetailsType.setCustomLabel(productId); if (ebayProductStoreInventory!=null) sellingManagerProductDetailsType.setQuantityAvailable(ebayProductStoreInventory.getBigDecimal("availableToPromiseListing").intValue()); @@ -243,7 +243,7 @@ public class EbayStoreInventoryServices Delegator delegator = dctx.getDelegator(); GetSellingManagerInventoryFolderRequestType req = null; GetSellingManagerInventoryFolderResponseType resp = null; - boolean flag = false; + boolean flag = false; try { if (context.get("productStoreId") != null) { Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java?rev=1044227&r1=1044226&r2=1044227&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java Fri Dec 10 07:20:25 2010 @@ -78,9 +78,9 @@ public class ClientProfile extends XPage protected static PosTransaction m_trans = null; protected String m_type = null; protected boolean cancelled = false; - private static final Boolean SWIP_WITH_CARD = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "SwipWithCard", "Y"); - private static final String START_SENTINEL = UtilProperties.getPropertyValue("parameters", "StartSentinel", ";"); - private static final String END_SENTINEL = UtilProperties.getPropertyValue("parameters", "EndSentinel", "?"); + private static final Boolean SWIP_WITH_CARD = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "SwipWithCard", "Y"); + private static final String START_SENTINEL = UtilProperties.getPropertyValue("parameters", "StartSentinel", ";"); + private static final String END_SENTINEL = UtilProperties.getPropertyValue("parameters", "EndSentinel", "?"); private static Locale locale = Locale.getDefault(); private String m_partyId = null; @@ -100,7 +100,7 @@ public class ClientProfile extends XPage m_nameRadioEquals.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "PosTipNameRadioEquals", locale)); m_nameRadioContains = (XRadioButton) m_dialog.findComponent("NameRadioContain"); m_nameRadioContains.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "PosTipNameRadioContains", locale)); - + m_emailLabel = (XLabel) m_dialog.findComponent("emailLabel"); m_emailEdit = (XEdit) m_dialog.findComponent("emailEdit"); m_phoneLabel = (XLabel) m_dialog.findComponent("phoneLabel"); @@ -144,7 +144,7 @@ public class ClientProfile extends XPage person = m_trans.getSession().getDelegator().findByPrimaryKey("Person", UtilMisc.toMap("partyId", m_partyId)); } catch (GenericEntityException e) { Debug.logError(e, module); - } + } if (UtilValidate.isNotEmpty(person)) { String cardId = person.getString("cardId"); if (UtilValidate.isNotEmpty(cardId)) { @@ -213,7 +213,7 @@ public class ClientProfile extends XPage } return; } - + public synchronized void editCard() { @@ -232,10 +232,10 @@ public class ClientProfile extends XPage String card = m_cardEdit.getText(); if (SWIP_WITH_CARD && UtilValidate.isNotEmpty(m_cardEdit.getText()) && (card.startsWith(START_SENTINEL) && card.endsWith(END_SENTINEL))) { - m_cardEdit.setText(card.substring(1, card.length() - 1)); + m_cardEdit.setText(card.substring(1, card.length() - 1)); } } - + return; } @@ -258,7 +258,7 @@ public class ClientProfile extends XPage if (UtilValidate.isNotEmpty(name)) { if (UtilValidate.isNotEmpty(card) && SWIP_WITH_CARD && card.startsWith(START_SENTINEL) && card.endsWith(END_SENTINEL)) { card = card.substring(1, card.length() - 1); - } + } editClientProfile(name, email, phone, card, editType, m_partyId); } else { m_pos.showDialog("dialog/error/exception", UtilProperties.getMessage(PosTransaction.resource, "PosFieldsRequired", locale)); @@ -311,7 +311,7 @@ public class ClientProfile extends XPage String card = clientInfos.length > 3 ? clientInfos[3] : ""; if (UtilValidate.isNotEmpty(card) && SWIP_WITH_CARD && card.startsWith(START_SENTINEL) && card.endsWith(END_SENTINEL)) { card = card.substring(1, card.length() - 1); - } + } m_nameEdit.setText(name); m_emailEdit.setText(email); m_phoneEdit.setText(phone); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |