svn commit: r926987 [9/26] - in /ofbiz/branches/multitenant201
Locked
svn commit: r926987 [9/26] - in /ofbiz/branches/multitenant201
 
|
Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Wed Mar 24 09:23:07 2010 @@ -61,13 +61,13 @@ under the License. </td> <td width="10%"> </td> </tr> - <tr><td colspan="4"><hr/></td></tr> + <tr><td colspan="4"><hr /></td></tr> <#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content> <#list orderPaymentPreferences as orderPaymentPreference> <#assign pmBillingAddress = {}> <#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem")> <#if outputted?default("false") == "true"> - <tr><td colspan="4"><hr/></td></tr> + <tr><td colspan="4"><hr /></td></tr> </#if> <#assign outputted = "true"> <#-- try the paymentMethod first; if paymentMethodId is specified it overrides paymentMethodTypeId --> @@ -86,7 +86,7 @@ under the License. <div> <span class="label"> ${uiLabelMap.AccountingFinAccount}</span> <#if orderPaymentPreference.maxAmount?has_content> - <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> + <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> </#if> </div> </td> @@ -97,9 +97,9 @@ under the License. ${finAccountType.description?default(finAccountType.finAccountTypeId)} </#if> #${finAccount.finAccountCode?default(finAccount.finAccountId)} (<a href="/accounting/control/EditFinAccount?finAccountId=${finAccount.finAccountId}&externalLoginKey=${externalLoginKey}" class="buttontext">${finAccount.finAccountId}</a>) - <br/> + <br /> ${finAccount.finAccountName?if_exists} - <br/> + <br /> <#-- Authorize and Capture transactions --> <div> @@ -113,17 +113,17 @@ under the License. </div> <#if gatewayResponses?has_content> <div> - <hr/> + <hr /> <#list gatewayResponses as gatewayResponse> <#assign transactionCode = gatewayResponse.getRelatedOne("TranCodeEnumeration")> ${(transactionCode.get("description",locale))?default("Unknown")}: ${gatewayResponse.transactionDate.toString()} - <@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br/> + <@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br /> (<span class"label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum?if_exists} <span class"label">${uiLabelMap.OrderAvs}</span> ${gatewayResponse.gatewayAvsResult?default("N/A")} <span class"label">${uiLabelMap.OrderScore}</span> ${gatewayResponse.gatewayScoreResult?default("N/A")}) <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a> - <#if gatewayResponse_has_next><hr/></#if> + <#if gatewayResponse_has_next><hr /></#if> </#list> </div> </#if> @@ -150,7 +150,7 @@ under the License. <td align="right" valign="top" width="29%"> <div> <span class"label">${paymentMethodType.get("description",locale)?if_exists}</span> <#if orderPaymentPreference.maxAmount?has_content> - <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> + <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> </#if> </div> </td> @@ -159,9 +159,9 @@ under the License. <td width="60%"> <div> <#if orderPaymentPreference.maxAmount?has_content> - <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> + <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> </#if> - <br/> [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>] + <br /> [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>] </div> <#-- <div><@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> - ${(orderPaymentPreference.authDate.toString())?if_exists}</div> @@ -201,7 +201,7 @@ under the License. <td align="right" valign="top" width="29%"> <div> <span class="label">${uiLabelMap.AccountingCreditCard}</span> <#if orderPaymentPreference.maxAmount?has_content> - <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> + <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> </#if> </div> </td> @@ -209,13 +209,13 @@ under the License. <td valign="top" width="60%"> <div> <#if creditCard?has_content> - <#if creditCard.companyNameOnCard?exists>${creditCard.companyNameOnCard}<br/></#if> + <#if creditCard.companyNameOnCard?exists>${creditCard.companyNameOnCard}<br /></#if> <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if> ${creditCard.firstNameOnCard} <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if> ${creditCard.lastNameOnCard?default("N/A")} <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if> - <br/> + <br /> <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)> ${creditCard.cardType} @@ -226,7 +226,7 @@ under the License. ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)} [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>] </#if> - <br/> + <br /> <#-- Authorize and Capture transactions --> <div> @@ -243,17 +243,17 @@ under the License. </div> <#if gatewayResponses?has_content> <div> - <hr/> + <hr /> <#list gatewayResponses as gatewayResponse> <#assign transactionCode = gatewayResponse.getRelatedOne("TranCodeEnumeration")> ${(transactionCode.get("description",locale))?default("Unknown")}: ${gatewayResponse.transactionDate.toString()} - <@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br/> + <@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br /> (<span class="label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum?if_exists} <span class="label">${uiLabelMap.OrderAvs}</span> ${gatewayResponse.gatewayAvsResult?default("N/A")} <span class="label">${uiLabelMap.OrderScore}</span> ${gatewayResponse.gatewayScoreResult?default("N/A")}) <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a> - <#if gatewayResponse_has_next><hr/></#if> + <#if gatewayResponse_has_next><hr /></#if> </#list> </div> </#if> @@ -281,7 +281,7 @@ under the License. <td align="right" valign="top" width="29%"> <div> <span class="label">${uiLabelMap.AccountingEFTAccount}</span> <#if orderPaymentPreference.maxAmount?has_content> - <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> + <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> </#if> </div> </td> @@ -289,9 +289,9 @@ under the License. <td valign="top" width="60%"> <div> <#if eftAccount?has_content> - ${eftAccount.nameOnAccount?if_exists}<br/> - <#if eftAccount.companyNameOnAccount?exists>${eftAccount.companyNameOnAccount}<br/></#if> - ${uiLabelMap.AccountingBankName}: ${eftAccount.bankName}, ${eftAccount.routingNumber}<br/> + ${eftAccount.nameOnAccount?if_exists}<br /> + <#if eftAccount.companyNameOnAccount?exists>${eftAccount.companyNameOnAccount}<br /></#if> + ${uiLabelMap.AccountingBankName}: ${eftAccount.bankName}, ${eftAccount.routingNumber}<br /> ${uiLabelMap.AccountingAccount}#: ${eftAccount.accountNumber} <#else> ${uiLabelMap.CommonInformation} ${uiLabelMap.CommonNot} ${uiLabelMap.CommonAvailable} @@ -321,7 +321,7 @@ under the License. <td align="right" valign="top" width="29%"> <div> <span class="label">${uiLabelMap.OrderGiftCard}</span> <#if orderPaymentPreference.maxAmount?has_content> - <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> + <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> </#if> </div> </td> @@ -359,18 +359,18 @@ under the License. </#if> </#if> <#if pmBillingAddress?has_content> - <tr><td> </td><td> </td><td colspan="3"><hr/></td></tr> + <tr><td> </td><td> </td><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="29%"> </td> <td width="1%"> </td> <td valign="top" width="60%"> <div> - <#if pmBillingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${pmBillingAddress.toName}<br/></#if> - <#if pmBillingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${pmBillingAddress.attnName}<br/></#if> - ${pmBillingAddress.address1}<br/> - <#if pmBillingAddress.address2?has_content>${pmBillingAddress.address2}<br/></#if> + <#if pmBillingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${pmBillingAddress.toName}<br /></#if> + <#if pmBillingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${pmBillingAddress.attnName}<br /></#if> + ${pmBillingAddress.address1}<br /> + <#if pmBillingAddress.address2?has_content>${pmBillingAddress.address2}<br /></#if> ${pmBillingAddress.city}<#if pmBillingAddress.stateProvinceGeoId?has_content>, ${pmBillingAddress.stateProvinceGeoId} </#if> - ${pmBillingAddress.postalCode?if_exists}<br/> + ${pmBillingAddress.postalCode?if_exists}<br /> ${pmBillingAddress.countryGeoId?if_exists} </div> </td> @@ -382,14 +382,14 @@ under the License. <#-- billing account --> <#if billingAccount?exists> <#if outputted?default("false") == "true"> - <tr><td colspan="4"><hr/></td></tr> + <tr><td colspan="4"><hr /></td></tr> </#if> <tr> <td align="right" valign="top" width="29%"> <#-- billing accounts require a special OrderPaymentPreference because it is skipped from above section of OPPs --> <div> <span class="label">${uiLabelMap.AccountingBillingAccount}</span> <#if billingAccountMaxAmount?has_content> - <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=billingAccountMaxAmount?default(0.00) isoCode=currencyUomId/> + <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=billingAccountMaxAmount?default(0.00) isoCode=currencyUomId/> </#if> </div> </td> @@ -401,7 +401,7 @@ under the License. </tr> </#if> <#if customerPoNumber?has_content> - <tr><td colspan="4"><hr/></td></tr> + <tr><td colspan="4"><hr /></td></tr> <tr> <td align="right" valign="top" width="29%"><span class="label">${uiLabelMap.OrderPONumber}</span></td> <td width="1%"> </td> @@ -412,7 +412,7 @@ under the License. <#-- invoices --> <#if invoices?has_content> - <tr><td colspan="4"><hr/></td></tr> + <tr><td colspan="4"><hr /></td></tr> <tr> <td align="right" valign="top" width="29%"> <span class="label">${uiLabelMap.OrderInvoices}</span></td> <td width="1%"> </td> @@ -431,7 +431,7 @@ under the License. </tr> </#if> <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED")) && (paymentMethodValueMaps?has_content)> - <tr><td colspan="4"><hr/></td></tr> + <tr><td colspan="4"><hr /></td></tr> <tr><td colspan="4"> <form name="addPaymentMethodToOrder" method="post" action="<@ofbizUrl>addPaymentMethodToOrder</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId?if_exists}"/> @@ -487,4 +487,4 @@ under the License. </#if> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Wed Mar 24 09:23:07 2010 @@ -341,7 +341,7 @@ under the License. <table width="100%" border="0" cellpadding="1" cellspacing="0"> <#if shipGroup.supplierPartyId?has_content> <#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shipGroup.supplierPartyId))?if_exists /> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> <span class="label"> ${uiLabelMap.ProductDropShipment} - ${uiLabelMap.PartySupplier}</span> @@ -357,7 +357,7 @@ under the License. <#-- getShipGroupEstimate method of ShippingEvents class can be used for get shipping estimate from system, on the basis of new package's weight --> <#if shippingRateList?has_content> <#if orderReadHelper.getOrderTypeId() != "PURCHASE_ORDER"> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td colspan="3"> <table> @@ -403,7 +403,7 @@ under the License. <#-- tracking number --> <#if shipGroup.trackingNumber?has_content || orderShipmentInfoSummaryList?has_content> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> <span class="label"> ${uiLabelMap.OrderTrackingNumber}</span> @@ -430,7 +430,7 @@ under the License. </tr> </#if> <#if shipGroup.maySplit?has_content && noShipment?default("false") != "true"> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> <span class="label"> ${uiLabelMap.OrderSplittingPreference}</span> @@ -499,7 +499,7 @@ under the License. <form name="setGiftMessageForm" method="post" action="<@ofbizUrl>setGiftMessage</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderHeader.orderId}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <td align="right" valign="top" width="15%"> <span class="label"> ${uiLabelMap.OrderGiftMessage}</span> </td> @@ -521,7 +521,7 @@ under the License. <form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderHeader.orderId}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> <span class="label"> ${uiLabelMap.OrderShipAfterDate}<span> @@ -546,7 +546,7 @@ under the License. </form> <#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment")> <#if shipGroupShipments?has_content> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> <span class="label"> ${uiLabelMap.FacilityShipments}<span> @@ -582,14 +582,14 @@ under the License. <#-- Manual shipment options --> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td colspan="3" valign="top" width="100%" align="center"> <#if orderHeader.orderTypeId == "SALES_ORDER"> <#if !shipGroup.supplierPartyId?has_content> <#if orderHeader.statusId == "ORDER_APPROVED"> <a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup}</a> - <br/> + <br /> </#if> <a href="javascript:document.createShipment_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a> <form name="createShipment_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment"> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderstats.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderstats.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderstats.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/orderstats.ftl Wed Mar 24 09:23:07 2010 @@ -34,7 +34,7 @@ under the License. </tr> <tr> <td colspan="2"> </td> - <td colspan="4"><hr/></td></tr> + <td colspan="4"><hr /></td></tr> <tr> <td class="label">${uiLabelMap.OrderOrdersTotals}</td> <td colspan="5"> </td> @@ -63,7 +63,7 @@ under the License. <td align="right">${monthItemTotalPending}</td> <td align="right">${yearItemTotalPending}</td> </tr> - <tr><td colspan="6"><hr/></td></tr> + <tr><td colspan="6"><hr /></td></tr> <tr> <td class="label">${uiLabelMap.OrderOrdersItemCounts}</td> <td colspan="5"> </td> @@ -92,7 +92,7 @@ under the License. <td align="right">${monthItemCountPending?string.number}</td> <td align="right">${yearItemCountPending?string.number}</td> </tr> - <tr><td colspan="6"><hr/></td></tr> + <tr><td colspan="6"><hr /></td></tr> <tr> <td class="label">${uiLabelMap.OrderOrdersPending}</td> <td colspan="5"> </td> @@ -121,7 +121,7 @@ under the License. <td align="right">--</td> <td align="right">--</td> </tr> - <tr><td colspan="6"><hr/></td></tr> + <tr><td colspan="6"><hr /></td></tr> <tr> <td class="label">${uiLabelMap.OrderStatusChanges}</td> <td colspan="5"> </td> @@ -171,4 +171,4 @@ under the License. </div> <#else> <h3>${uiLabelMap.OrderViewPermissionError}</h3> -</#if> \ No newline at end of file +</#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/receivepayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/receivepayment.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/receivepayment.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/receivepayment.ftl Wed Mar 24 09:23:07 2010 @@ -57,7 +57,7 @@ under the License. <a href="javascript:document.paysetupform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> </div> </div> -<br/> +<br /> <#else> <h3>${uiLabelMap.OrderViewPermissionError}</h3> </#if> \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl Wed Mar 24 09:23:07 2010 @@ -28,7 +28,7 @@ under the License. <div class="screenlet-body"> <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a> <a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a> - <br/> + <br /> <form method="post" action="<@ofbizUrl>sendconfirmationmail/${donePage}</@ofbizUrl>" name="sendConfirmationForm"> <#if ! productStoreEmailSetting?exists> <#assign productStoreEmailSetting = {} /> @@ -83,7 +83,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a> <a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a> </div> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/transitions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/transitions.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/transitions.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/order/transitions.ftl Wed Mar 24 09:23:07 2010 @@ -63,7 +63,7 @@ under the License. </div> </div> </#if> -<br/> +<br /> <#if wfTransitions?exists && wfTransitions?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl Wed Mar 24 09:23:07 2010 @@ -17,10 +17,10 @@ specific language governing permissions under the License. --> <span class="label">${uiLabelMap.OrderOrderQuoteCoefficients}</span> -<br/> +<br /> <#list quoteCoefficients as quoteCoefficient> <div>${quoteCoefficient.coeffName} ${quoteCoefficient.coeffValue}</div> </#list> -<br/> +<br /> <div><span class="label">${uiLabelMap.CommonTotalCostMult}</span> ${costMult}</div> <div><span class="label">${uiLabelMap.CommonTotalCostToPriceMult}</span> ${costToPriceMult}</div> \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl Wed Mar 24 09:23:07 2010 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<br/> +<br /> <div><span class="label">${uiLabelMap.CommonTotalCost}</span> ${totalCost}</div> <div><span class="label">${uiLabelMap.CommonTotalPrice}</span> ${totalPrice}</div> <div><span class="label">${uiLabelMap.CommonTotalCostMult}</span> ${totalCostMult}</div> \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Wed Mar 24 09:23:07 2010 @@ -101,12 +101,12 @@ under the License. <#-- toggle the row color --> <#assign alt_row = !alt_row> </#list> - <tr><td colspan="10"><hr/></td></tr> + <tr><td colspan="10"><hr /></td></tr> <tr> <td align="right" colspan="6" class="label">${uiLabelMap.CommonSubtotal}</td> <td align="right"><@ofbizCurrency amount=totalQuoteAmount isoCode=quote.currencyUomId/></td> </tr> - <tr><td colspan="5"></td><td colspan="6"><hr/></td></tr> + <tr><td colspan="5"></td><td colspan="6"><hr /></td></tr> <#assign totalQuoteHeaderAdjustmentAmount = 0.0> <#assign findAdjustment = false> <#list quoteAdjustments as quoteAdjustment> @@ -122,7 +122,7 @@ under the License. </#list> <#assign grandTotalQuoteAmount = totalQuoteAmount + totalQuoteHeaderAdjustmentAmount> <#if findAdjustment> - <tr><td colspan="5"></td><td colspan="6"><hr/></td></tr> + <tr><td colspan="5"></td><td colspan="6"><hr /></td></tr> </#if> <tr> <td align="right" colspan="6" class="label">${uiLabelMap.OrderGrandTotal}</td> @@ -132,4 +132,4 @@ under the License. </tr> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl Wed Mar 24 09:23:07 2010 @@ -20,13 +20,13 @@ under the License. <#list quoteCoefficients as quoteCoefficient> <div>${quoteCoefficient.coeffName}: ${quoteCoefficient.coeffValue}</div> </#list> -<br/> +<br /> <div><span class="label">${uiLabelMap.CommonTotalCostMult}</span> ${costMult}</div> <div><span class="label">${uiLabelMap.CommonTotalCostToPriceMult}</span> ${costToPriceMult}</div> -<br/> +<br /> <div><span class="label">${uiLabelMap.CommonTotalCost}</span> <@ofbizCurrency amount=totalCost isoCode=quote.currencyUomId/></div> <div><span class="label">${uiLabelMap.CommonTotalAmount}</span> <@ofbizCurrency amount=totalPrice isoCode=quote.currencyUomId/></div> -<br/> +<br /> <div><span class="label">${uiLabelMap.CommonTotalProfit}</span> <@ofbizCurrency amount=totalProfit isoCode=quote.currencyUomId/></div> <div><span class="label">${uiLabelMap.CommonTotalPercProfit}</span> ${totalPercProfit}%</div> -<br/> \ No newline at end of file +<br /> \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteDate.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteDate.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteDate.ftl Wed Mar 24 09:23:07 2010 @@ -31,7 +31,7 @@ under the License. ${(quote.issueDate.toString())?if_exists} </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonValidFromDate} @@ -41,7 +41,7 @@ under the License. ${(quote.validFromDate.toString())?if_exists} </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonValidThruDate} @@ -53,4 +53,4 @@ under the License. </tr> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteInfo.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteInfo.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteInfo.ftl Wed Mar 24 09:23:07 2010 @@ -32,7 +32,7 @@ under the License. ${(quoteType.get("description",locale))?default(quote.quoteTypeId?if_exists)} </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <#-- quote Channel information --> <tr> @@ -44,7 +44,7 @@ under the License. ${(salesChannel.get("description",locale))?default(quote.salesChannelEnumId?if_exists)} </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <#-- quote status information --> <tr> @@ -57,7 +57,7 @@ under the License. </td> </tr> <#-- party --> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.PartyPartyId} @@ -68,7 +68,7 @@ under the License. </td> </tr> <#-- quote name --> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderOrderQuoteName} @@ -79,7 +79,7 @@ under the License. </td> </tr> <#-- quote description --> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonDescription} @@ -90,7 +90,7 @@ under the License. </td> </tr> <#-- quote currency --> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonCurrency} @@ -101,7 +101,7 @@ under the License. </td> </tr> <#-- quote currency --> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.ProductProductStore} @@ -113,4 +113,4 @@ under the License. </tr> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteRoles.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteRoles.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteRoles.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/quote/quoteRoles.ftl Wed Mar 24 09:23:07 2010 @@ -37,10 +37,10 @@ under the License. </td> </tr> <#if quoteRoles.size() != row> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> </#if> <#assign row = row + 1> </#list> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign Wed Mar 24 09:23:07 2010 @@ -167,38 +167,38 @@ totalShippingCharge = 0; totalShippingBalance = 0; productPromoCodes = delegator.findList("ProductPromoCode", EntityCondition.makeCondition("productPromoId", EntityOperator.EQUALS, productPromoId), null, null, null, false); if(productPromoCodes.size()>0){ - productPromoCodeId = productPromoCodes.get(0).getString("productPromoCodeId"); - orderProductPromoCodes = delegator.findList("OrderProductPromoCode", EntityCondition.makeCondition("productPromoCodeId", EntityOperator.EQUALS, productPromoCodeId), null, null, null, false); - totalOrders = orderProductPromoCodes.size(); - for(i = 0; i < totalOrders; i++){ - orderId = orderProductPromoCodes.get(i).getString("orderId"); - input.put("userLogin",userLogin); - input.put("orderId",orderId); - //Order Total - orderInfo = dispatcher.runSync("getOrderHeaderInformation", input); - amount = orderInfo.get("grandTotal"); - totalOrdersAmount = totalOrdersAmount + amount; - //Shipping Total - cond = FastList.newInstance(); - cond.add(EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId)); - cond.add(EntityCondition.makeCondition("orderAdjustmentTypeId", EntityOperator.EQUALS, "SHIPPING_CHARGES")); - orderAdjustments = delegator.findList("OrderAdjustment", EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null, false); - orderAdjustmentSize = orderAdjustments.size(); - for(j = 0; j < orderAdjustmentSize; j++){ - shippingCharge = 0; - shippingCharge = orderAdjustments.get(j).get("amount"); - if(shippingCharge){ - shippingCharge = shippingCharge.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - } - totalShippingCharge = totalShippingCharge + shippingCharge; - } - shippingAmount = dispatcher.runSync("getOrderShippingAmount", input); - amount = shippingAmount.get("shippingAmount"); - if(amount){ - amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - } - totalShippingAmount = totalShippingAmount + amount; - } + productPromoCodeId = productPromoCodes.get(0).getString("productPromoCodeId"); + orderProductPromoCodes = delegator.findList("OrderProductPromoCode", EntityCondition.makeCondition("productPromoCodeId", EntityOperator.EQUALS, productPromoCodeId), null, null, null, false); + totalOrders = orderProductPromoCodes.size(); + for(i = 0; i < totalOrders; i++){ + orderId = orderProductPromoCodes.get(i).getString("orderId"); + input.put("userLogin",userLogin); + input.put("orderId",orderId); + //Order Total + orderInfo = dispatcher.runSync("getOrderHeaderInformation", input); + amount = orderInfo.get("grandTotal"); + totalOrdersAmount = totalOrdersAmount + amount; + //Shipping Total + cond = FastList.newInstance(); + cond.add(EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId)); + cond.add(EntityCondition.makeCondition("orderAdjustmentTypeId", EntityOperator.EQUALS, "SHIPPING_CHARGES")); + orderAdjustments = delegator.findList("OrderAdjustment", EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null, false); + orderAdjustmentSize = orderAdjustments.size(); + for(j = 0; j < orderAdjustmentSize; j++){ + shippingCharge = 0; + shippingCharge = orderAdjustments.get(j).get("amount"); + if(shippingCharge){ + shippingCharge = shippingCharge.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + } + totalShippingCharge = totalShippingCharge + shippingCharge; + } + shippingAmount = dispatcher.runSync("getOrderShippingAmount", input); + amount = shippingAmount.get("shippingAmount"); + if(amount){ + amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + } + totalShippingAmount = totalShippingAmount + amount; + } } row["productPromoId"] = productPromoId; row["promoName"] = promoName; Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign Wed Mar 24 09:23:07 2010 @@ -224,51 +224,51 @@ try { month = thisMonth; while(i<3){ i = i + 1; - switch(month) - { - case 1: - months.add(1); - break; - case 2: - months.add(2); - break; - case 3: - months.add(3); - break; - case 4: - months.add(4); - break; - case 5: - months.add(5); - break; - case 6: - months.add(6); - break; - case 7: - months.add(7); - break; - case 8: - months.add(8); - break; - case 9: - months.add(9); - break; - case 10: - months.add(10); - break; - case 11: - months.add(11); - break; - case 12: - months.add(12); - break; - } - month = month - 1 - } - Debug.log("================ Last 3 Months Sale Order Report====="+months); - cond = FastList.newInstance(); - cond.add(EntityCondition.makeCondition("orderDateMonthOfYear", EntityOperator.IN, months)); - cond.add(EntityCondition.makeCondition("orderDateYearName", EntityOperator.EQUALS, thisYear)); + switch(month) + { + case 1: + months.add(1); + break; + case 2: + months.add(2); + break; + case 3: + months.add(3); + break; + case 4: + months.add(4); + break; + case 5: + months.add(5); + break; + case 6: + months.add(6); + break; + case 7: + months.add(7); + break; + case 8: + months.add(8); + break; + case 9: + months.add(9); + break; + case 10: + months.add(10); + break; + case 11: + months.add(11); + break; + case 12: + months.add(12); + break; + } + month = month - 1 + } + Debug.log("================ Last 3 Months Sale Order Report====="+months); + cond = FastList.newInstance(); + cond.add(EntityCondition.makeCondition("orderDateMonthOfYear", EntityOperator.IN, months)); + cond.add(EntityCondition.makeCondition("orderDateYearName", EntityOperator.EQUALS, thisYear)); salesOrderItemStarSchemas = delegator.findList("SalesOrderItemStarSchema", EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null, false); } catch(e) { Debug.logError(e,""); @@ -298,13 +298,13 @@ price = 0; internalName = "None"; input = FastMap.newInstance(); try { - product = delegator.findByPrimaryKey("Product",UtilMisc.toMap("productId", salesOrderItemStarSchema.getString("productProductId"))); - input.put("product", product); - input.put("userLogin", userLogin); + product = delegator.findByPrimaryKey("Product",UtilMisc.toMap("productId", salesOrderItemStarSchema.getString("productProductId"))); + input.put("product", product); + input.put("userLogin", userLogin); result = dispatcher.runSync("calculateProductPrice", input); price = result.get("price"); if(product.get("internalName")){ - internalName = product.get("internalName"); + internalName = product.get("internalName"); } } catch (e) { Debug.logError(e, module); Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign Wed Mar 24 09:23:07 2010 @@ -543,7 +543,7 @@ classLoader = appContext.get(EngineConst starschemas = null; try { - productStoreId = params["productStoreId"].value; + productStoreId = params["productStoreId"].value; DateMonth = params["DateMonth"].value; DateYear = params["DateYear"].value; methodContext = new MethodContext(appContext, classLoader, MethodContext.SERVICE); @@ -580,261 +580,261 @@ if (starschemas) }]]></method> <method name="fetch"><![CDATA[if (currentRow >= totalRows) return false; { - starschema = starschemas.get(currentRow); - orderDateDateValue = starschema.getString("orderDateDateValue"); - orderDateDayName = starschema.getString("orderDateDayName"); - orderDateDayOfMonth = starschema.getString("orderDateDayOfMonth"); - orderDateMonthName = starschema.getString("orderDateMonthName"); - orderDateYearName = starschema.getString("orderDateYearName"); - orderDateYearMonthDay = starschema.getString("orderDateYearMonthDay"); - orderDateMonthOfYear = starschema.getString("orderDateMonthOfYear"); - orderDateDescription = starschema.getString("orderDateDescription"); - - quantity = starschema.getString("quantity"); - GS = starschema.getString("GrossSales"); - GMS = starschema.getString("GrossMerchandizeSales"); - GMP = starschema.getString("GrossMerchandizeProfit"); - GSP = starschema.getString("GrossShippingProfit"); - GP = starschema.getString("GrossProfit"); - eBay = starschema.getString("eBay"); - RRC = starschema.getString("RRC"); - Others = starschema.getString("OtherFree"); - NBO = starschema.getString("NBO"); - - salesChannelEnumId = starschema.getString("salesChannelEnumId"); + starschema = starschemas.get(currentRow); + orderDateDateValue = starschema.getString("orderDateDateValue"); + orderDateDayName = starschema.getString("orderDateDayName"); + orderDateDayOfMonth = starschema.getString("orderDateDayOfMonth"); + orderDateMonthName = starschema.getString("orderDateMonthName"); + orderDateYearName = starschema.getString("orderDateYearName"); + orderDateYearMonthDay = starschema.getString("orderDateYearMonthDay"); + orderDateMonthOfYear = starschema.getString("orderDateMonthOfYear"); + orderDateDescription = starschema.getString("orderDateDescription"); + + quantity = starschema.getString("quantity"); + GS = starschema.getString("GrossSales"); + GMS = starschema.getString("GrossMerchandizeSales"); + GMP = starschema.getString("GrossMerchandizeProfit"); + GSP = starschema.getString("GrossShippingProfit"); + GP = starschema.getString("GrossProfit"); + eBay = starschema.getString("eBay"); + RRC = starschema.getString("RRC"); + Others = starschema.getString("OtherFree"); + NBO = starschema.getString("NBO"); + + salesChannelEnumId = starschema.getString("salesChannelEnumId"); - if (orderDateMonthOfYear == DateMonth) - { - row["Daily"] = 1; - } - else - { - row["Daily"] = 2; - } - - if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_AU; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_CA; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_IE; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_SG; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_UK; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_US; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_DE; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_ES; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_FR; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_IT; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - - currentRow ++; + if (orderDateMonthOfYear == DateMonth) + { + row["Daily"] = 1; + } + else + { + row["Daily"] = 2; + } + + if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_AU; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_CA; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_IE; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_SG; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_UK; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_US; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_DE; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_ES; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_FR; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_IT; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + + currentRow ++; } return true;]]></method> @@ -1167,7 +1167,7 @@ classLoader = appContext.get(EngineConst starschemas = null; try { - productStoreId = params["productStoreId"].value; + productStoreId = params["productStoreId"].value; DateDay = params["DateDay"].value; methodContext = new MethodContext(appContext, classLoader, MethodContext.SERVICE); methodContext.putEnv("productStoreId", productStoreId); @@ -1201,242 +1201,242 @@ if (Date_starschemas) }]]></method> <method name="fetch"><![CDATA[if (currentRow >= totalRows) return false; { - Date_starschema = Date_starschemas.get(currentRow); - orderDateDateValue = Date_starschema.getString("orderDateDateValue"); - orderDateDayName = Date_starschema.getString("orderDateDayName"); - orderDateDayOfMonth = Date_starschema.getString("orderDateDayOfMonth"); - orderDateMonthName = Date_starschema.getString("orderDateMonthName"); - orderDateYearName = Date_starschema.getString("orderDateYearName"); - orderDateYearMonthDay = Date_starschema.getString("orderDateYearMonthDay"); - orderDateMonthOfYear = Date_starschema.getString("orderDateMonthOfYear"); - orderDateDescription = Date_starschema.getString("orderDateDescription"); - - quantity = Date_starschema.getString("quantity"); - GS = Date_starschema.getString("GrossSales"); - GMS = Date_starschema.getString("GrossMerchandizeSales"); - GMP = Date_starschema.getString("GrossMerchandizeProfit"); - GSP = Date_starschema.getString("GrossShippingProfit"); - GP = Date_starschema.getString("GrossProfit"); - eBay = Date_starschema.getString("eBay"); - RRC = Date_starschema.getString("RRC"); - Others = Date_starschema.getString("OtherFree"); - NBO = Date_starschema.getString("NBO"); - - salesChannelEnumId = Date_starschema.getString("salesChannelEnumId"); - - if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_AU; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_CA; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_IE; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_SG; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_UK; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_US; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_DE; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_ES; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_FR; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_IT; - row["Date"] = orderDateYearMonthDay; - } - - currentRow ++; + Date_starschema = Date_starschemas.get(currentRow); + orderDateDateValue = Date_starschema.getString("orderDateDateValue"); + orderDateDayName = Date_starschema.getString("orderDateDayName"); + orderDateDayOfMonth = Date_starschema.getString("orderDateDayOfMonth"); + orderDateMonthName = Date_starschema.getString("orderDateMonthName"); + orderDateYearName = Date_starschema.getString("orderDateYearName"); + orderDateYearMonthDay = Date_starschema.getString("orderDateYearMonthDay"); + orderDateMonthOfYear = Date_starschema.getString("orderDateMonthOfYear"); + orderDateDescription = Date_starschema.getString("orderDateDescription"); + + quantity = Date_starschema.getString("quantity"); + GS = Date_starschema.getString("GrossSales"); + GMS = Date_starschema.getString("GrossMerchandizeSales"); + GMP = Date_starschema.getString("GrossMerchandizeProfit"); + GSP = Date_starschema.getString("GrossShippingProfit"); + GP = Date_starschema.getString("GrossProfit"); + eBay = Date_starschema.getString("eBay"); + RRC = Date_starschema.getString("RRC"); + Others = Date_starschema.getString("OtherFree"); + NBO = Date_starschema.getString("NBO"); + + salesChannelEnumId = Date_starschema.getString("salesChannelEnumId"); + + if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_AU; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_CA; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_IE; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_SG; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_UK; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_US; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_DE; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_ES; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_FR; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_IT; + row["Date"] = orderDateYearMonthDay; + } + + currentRow ++; } return true;]]></method> @@ -1559,7 +1559,7 @@ classLoader = appContext.get(EngineConst starschemas = null; try { - productStoreId = params["productStoreId"].value; + productStoreId = params["productStoreId"].value; DateMonth = params["DateMonth"].value; DateYear = params["DateYear"].value; methodContext = new MethodContext(appContext, classLoader, MethodContext.SERVICE); @@ -1595,106 +1595,106 @@ if (starschemas) }]]></method> <method name="fetch"><![CDATA[if (currentRow >= totalRows) return false; { - starschema = starschemas.get(currentRow); + starschema = starschemas.get(currentRow); - salesChannelEnumId = starschema.getString("salesChannelEnumId"); - orderDateMonthName = starschema.getString("orderDateMonthName"); - orderDateYearName = starschema.getString("orderDateYearName"); - NBO = starschema.getString("NBO"); - CountDate = starschema.getString("CountDate"); - - if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod1; - row["Account"] = account_B2C_AU; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod1; - row["Account"] = account_B2C_CA; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod1; - row["Account"] = account_B2C_IE; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod1; - row["Account"] = account_B2C_SG; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod1; - row["Account"] = account_B2C_UK; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod1; - row["Account"] = account_B2C_US; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod2; - row["Account"] = account_B2C_DE; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod2; - row["Account"] = account_B2C_ES; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod2; - row["Account"] = account_B2C_FR; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod2; - row["Account"] = account_B2C_IT; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - - currentRow ++; + salesChannelEnumId = starschema.getString("salesChannelEnumId"); + orderDateMonthName = starschema.getString("orderDateMonthName"); + orderDateYearName = starschema.getString("orderDateYearName"); + NBO = starschema.getString("NBO"); + CountDate = starschema.getString("CountDate"); + + if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod1; + row["Account"] = account_B2C_AU; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod1; + row["Account"] = account_B2C_CA; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod1; + row["Account"] = account_B2C_IE; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod1; + row["Account"] = account_B2C_SG; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod1; + row["Account"] = account_B2C_UK; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod1; + row["Account"] = account_B2C_US; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod2; + row["Account"] = account_B2C_DE; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod2; + row["Account"] = account_B2C_ES; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod2; + row["Account"] = account_B2C_FR; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod2; + row["Account"] = account_B2C_IT; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + + currentRow ++; } return true;]]></method> @@ -4299,11 +4299,11 @@ return true;]]></method> <property name="name">Show_Daily</property> <expression name="expression">if(dimension["Account"]["Daily"]==1) { - "Daily Avg in "+dimension["Account"]["Daily"]["orderDateMonthName"].substring(0,3) + "Daily Avg in "+dimension["Account"]["Daily"]["orderDateMonthName"].substring(0,3) } else if(dimension["Account"]["Daily"]==2) { - "Daily Avg in "+dimension["Account"]["Daily"]["orderDateMonthName"].substring(0,3) + "Daily Avg in "+dimension["Account"]["Daily"]["orderDateMonthName"].substring(0,3) }</expression> <property name="dataType">string</property> </structure> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |