buildbot success in on ofbizTrunkFramework
The Buildbot has detected a restored build on builder ofbizTrunkFramework while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/1514 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' triggered this build Build Source Stamp: [branch trunk] 86b0a4e592cbf087f5266d5e1347e963031b1c34 Blamelist: Suraj Khurana <64310724+surajkhur...@users.noreply.github.com> Build succeeded! Sincerely, -The Buildbot
buildbot exception in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a build exception on builder ofbizTrunkFrameworkPlugins while building ofbiz-plugins. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1393 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkPluginsCommit' triggered this build Build Source Stamp: [branch trunk] ade15ec80a6b241ad2e92ba89ab6bf88f9fde8cf Blamelist: Suraj Khurana BUILD FAILED: exception upload_2 Sincerely, -The Buildbot
[ofbiz-plugins] branch trunk updated: Improved: Improvement of Quick Add screen according to new bootstrap framework. (OFBIZ-11386) Thanks Nitish Mishra for reporting and providing the patch.
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new ade15ec Improved: Improvement of Quick Add screen according to new
bootstrap framework. (OFBIZ-11386) Thanks Nitish Mishra for reporting and
providing the patch.
ade15ec is described below
commit ade15ec80a6b241ad2e92ba89ab6bf88f9fde8cf
Author: Suraj Khurana
AuthorDate: Sat May 23 11:03:37 2020 +0530
Improved: Improvement of Quick Add screen according to new bootstrap
framework.
(OFBIZ-11386)
Thanks Nitish Mishra for reporting and providing the patch.
---
ecommerce/template/order/QuickAdd.ftl | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/ecommerce/template/order/QuickAdd.ftl
b/ecommerce/template/order/QuickAdd.ftl
index 3491d54..0b49a8e 100644
--- a/ecommerce/template/order/QuickAdd.ftl
+++ b/ecommerce/template/order/QuickAdd.ftl
@@ -16,11 +16,14 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
+
<#if productCategory?has_content>
-${productCategory.categoryName!}
-
-
+
+ ${productCategory.categoryName!}
+
+
+
+
${productCategory.categoryName!}
--
<#list quickAddCats as quickAddCatalogId>
@@ -30,15 +33,17 @@ under the License.
-${uiLabelMap.ProductChooseQuickAddCategory}
+${uiLabelMap.ProductChooseQuickAddCategory}
<#if productCategory.categoryImageUrl?? || productCategory.longDescription??>
<#if productCategory.categoryImageUrl??>
+
${productCategory.longDescription!}
+
@@ -47,7 +52,7 @@ ${productCategory.longDescription!}
- ${uiLabelMap.OrderAddAllToCart}
+ ${uiLabelMap.OrderAddAllToCart}
<#list productCategoryMembers as productCategoryMember>
@@ -58,12 +63,14 @@ ${productCategory.longDescription!}
-
- ${uiLabelMap.OrderAddAllToCart}
+
+ ${uiLabelMap.OrderAddAllToCart}
<#else>
${uiLabelMap.ProductNoProductsInThisCategory}.
+
+
[ofbiz-plugins] branch trunk updated: Improved: UI markup Improvement of Inline promotion screen according to latest bootstrap. (OFBIZ-11397) Thanks Nitish Mishra for reporting and providing the patch
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7aa38a2 Improved: UI markup Improvement of Inline promotion screen
according to latest bootstrap. (OFBIZ-11397) Thanks Nitish Mishra for reporting
and providing the patch.
7aa38a2 is described below
commit 7aa38a284b3edde1ff3164a927abeb18e9748156
Author: Suraj Khurana
AuthorDate: Sat May 23 10:50:32 2020 +0530
Improved: UI markup Improvement of Inline promotion screen according to
latest bootstrap.
(OFBIZ-11397)
Thanks Nitish Mishra for reporting and providing the patch.
---
ecommerce/template/cart/PromoUseDetailsInline.ftl | 24 ---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/ecommerce/template/cart/PromoUseDetailsInline.ftl
b/ecommerce/template/cart/PromoUseDetailsInline.ftl
index 9968f3f..6e47fb0 100644
--- a/ecommerce/template/cart/PromoUseDetailsInline.ftl
+++ b/ecommerce/template/cart/PromoUseDetailsInline.ftl
@@ -16,10 +16,18 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-${uiLabelMap.OrderPromotionInformation}:
+
+
+ ${uiLabelMap.OrderPromotionInformation}
+
+
-${uiLabelMap.OrderPromotionsApplied}:
+
+
+ ${uiLabelMap.OrderPromotionsApplied}
+
+
<#list shoppingCart.getProductPromoUseInfoIter() as
productPromoUseInfo>
@@ -36,10 +44,16 @@ under the License.
+
+
-${uiLabelMap.OrderCartItemUseinPromotions}:
+
+
+ ${uiLabelMap.OrderCartItemUseinPromotions}
+
+
<#list shoppingCart.items() as cartLine>
<#assign cartLineIndex = shoppingCart.getItemIndex(cartLine)>
@@ -76,5 +90,9 @@ under the License.
+
+
+
+
\ No newline at end of file
[ofbiz-framework] branch trunk updated: Improved: Refactor simple methods names as per naming convention best practices. (#137)
This is an automated email from the ASF dual-hosted git repository. surajk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 86b0a4e Improved: Refactor simple methods names as per naming convention best practices. (#137) 86b0a4e is described below commit 86b0a4e592cbf087f5266d5e1347e963031b1c34 Author: Suraj Khurana <64310724+surajkhur...@users.noreply.github.com> AuthorDate: Sat May 23 10:33:46 2020 +0530 Improved: Refactor simple methods names as per naming convention best practices. (#137) (OFBIZ-11700) --- .../accounting/minilang/invoice/InvoiceServices.xml| 18 +- .../minilang/test/AutoAcctgTransTestsPurchase.xml | 8 .../minilang/test/AutoAcctgTransTestsSales.xml | 8 applications/order/minilang/order/OrderServices.xml| 2 +- applications/order/minilang/test/ShoppingCartTests.xml | 2 +- applications/order/servicedef/services.xml | 4 ++-- .../imagemanagement/ImageManagementServices.xml| 2 +- applications/product/servicedef/services.xml | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/applications/accounting/minilang/invoice/InvoiceServices.xml b/applications/accounting/minilang/invoice/InvoiceServices.xml index 4629f1e..166b166 100644 --- a/applications/accounting/minilang/invoice/InvoiceServices.xml +++ b/applications/accounting/minilang/invoice/InvoiceServices.xml @@ -102,7 +102,7 @@ under the License. - + @@ -150,7 +150,7 @@ under the License. - + @@ -184,7 +184,7 @@ under the License. - + @@ -218,9 +218,9 @@ under the License. - + - + @@ -328,7 +328,7 @@ under the License. - + @@ -337,7 +337,7 @@ under the License. - + @@ -433,7 +433,7 @@ under the License. - + @@ -456,7 +456,7 @@ under the License. - + diff --git a/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml b/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml index 7174d54..f6523a3 100644 --- a/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml +++ b/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml @@ -67,7 +67,7 @@ under the License. - + @@ -133,7 +133,7 @@ under the License. - + @@ -177,7 +177,7 @@ under the License. - + @@ -198,7 +198,7 @@ under the License. - diff --git a/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml b/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml index e1095bd..b826d7e 100644 --- a/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml +++ b/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml @@ -68,7 +68,7 @@ under the License. - + @@ -144,7 +144,7 @@ under the License. - + @@ -168,7 +168,7 @@ under the License. - + @@ -226,7 +226,7 @@ under the License. - + diff --git a/applications/order/minilang/order/OrderServices.xml b/applications/order/minilang/order/OrderServices.xml index a0c7eb1..f318825 100644 --- a/applications/order/minilang/order/OrderServices.xml +++ b/applications/order/minilang/order/OrderServices.xml @@ -1269,7 +1269,7 @@ under the License. - + diff --git a/applications/order/minilang/test/ShoppingCartTests.xml b/applications/order/minilang/test/ShoppingCartTests.xml index a881b14..0e4e08a 100644 --- a/applications/order/minilang/test/ShoppingCartTests.xml +++ b/applications/order/minilang/test/ShoppingCartTests.xml @@ -720,7 +720,7 @@ under the License. - + diff --git a/applications/order/servicedef/services.xml b/applications/order/servicedef/services.xml index 3ad4c59..76d5eb0 100644 --- a/applications/order/servicedef/services.xml +++ b/applications/order/servicedef/services.xml @@ -1567,8 +1567,8 @@ under the License. - + Move order items between ship groups diff --git
[ofbiz-plugins] branch trunk updated: Improved: Refactor simple methods names as per naming convention best practices. (#20)
This is an automated email from the ASF dual-hosted git repository. surajk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git The following commit(s) were added to refs/heads/trunk by this push: new 9c6838e Improved: Refactor simple methods names as per naming convention best practices. (#20) 9c6838e is described below commit 9c6838ef0b4f5e2e21b9e3161cd5a53de1df1657 Author: Suraj Khurana <64310724+surajkhur...@users.noreply.github.com> AuthorDate: Sat May 23 10:34:37 2020 +0530 Improved: Refactor simple methods names as per naming convention best practices. (#20) (OFBIZ-11700) --- projectmgr/minilang/ProjectServices.xml | 4 ++-- projectmgr/minilang/ProjectSimpleEvents.xml | 2 +- projectmgr/webapp/projectmgr/WEB-INF/controller.xml | 2 +- scrum/minilang/ScrumEvents.xml | 6 +++--- scrum/webapp/scrum/WEB-INF/controller.xml | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projectmgr/minilang/ProjectServices.xml b/projectmgr/minilang/ProjectServices.xml index 960f1fd..b16d4f1 100644 --- a/projectmgr/minilang/ProjectServices.xml +++ b/projectmgr/minilang/ProjectServices.xml @@ -1403,7 +1403,7 @@ - + @@ -1478,7 +1478,7 @@ - + diff --git a/projectmgr/minilang/ProjectSimpleEvents.xml b/projectmgr/minilang/ProjectSimpleEvents.xml index eadcfe6..55ddb9d 100644 --- a/projectmgr/minilang/ProjectSimpleEvents.xml +++ b/projectmgr/minilang/ProjectSimpleEvents.xml @@ -19,7 +19,7 @@ --> http://www.w3.org/2001/XMLSchema-instance; xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> - + diff --git a/projectmgr/webapp/projectmgr/WEB-INF/controller.xml b/projectmgr/webapp/projectmgr/WEB-INF/controller.xml index 6534ea8..b977df7 100644 --- a/projectmgr/webapp/projectmgr/WEB-INF/controller.xml +++ b/projectmgr/webapp/projectmgr/WEB-INF/controller.xml @@ -534,7 +534,7 @@ - + diff --git a/scrum/minilang/ScrumEvents.xml b/scrum/minilang/ScrumEvents.xml index eb1cedc..9202ea3 100644 --- a/scrum/minilang/ScrumEvents.xml +++ b/scrum/minilang/ScrumEvents.xml @@ -390,7 +390,7 @@ - + @@ -2188,7 +2188,7 @@ - + @@ -3328,7 +3328,7 @@ - + diff --git a/scrum/webapp/scrum/WEB-INF/controller.xml b/scrum/webapp/scrum/WEB-INF/controller.xml index 41aab3d..28c0df4 100644 --- a/scrum/webapp/scrum/WEB-INF/controller.xml +++ b/scrum/webapp/scrum/WEB-INF/controller.xml @@ -104,7 +104,7 @@ under the License. - + @@ -1086,7 +1086,7 @@ under the License. - + @@ -1153,7 +1153,7 @@ under the License. - +
buildbot exception in on ofbizTrunkFramework
The Buildbot has detected a build exception on builder ofbizTrunkFramework while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/1513 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' triggered this build Build Source Stamp: [branch trunk] 89016fa71e85820b3ef19134f14238baf53c2acf Blamelist: Suraj Khurana BUILD FAILED: exception upload Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Improved: Converted getPaymentRunningTotal service from mini-lang to groovy DSL (OFBIZ-11488) Thanks Nitish Mishra for the patch and Devanshu Vyas for reporting
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 89016fa Improved: Converted getPaymentRunningTotal service from
mini-lang to groovy DSL (OFBIZ-11488) Thanks Nitish Mishra for the patch and
Devanshu Vyas for reporting and review.
89016fa is described below
commit 89016fa71e85820b3ef19134f14238baf53c2acf
Author: Suraj Khurana
AuthorDate: Sat May 23 10:27:50 2020 +0530
Improved: Converted getPaymentRunningTotal service from mini-lang to groovy
DSL
(OFBIZ-11488)
Thanks Nitish Mishra for the patch and Devanshu Vyas for reporting and
review.
---
.../groovyScripts/payment/PaymentServices.groovy | 37 ++
.../minilang/payment/PaymentServices.xml | 21
.../accounting/servicedef/services_payment.xml | 4 +--
3 files changed, 39 insertions(+), 23 deletions(-)
diff --git
a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
index 56c653b..b71c419 100644
--- a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
+++ b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
@@ -18,7 +18,10 @@
*/
import org.apache.ofbiz.base.util.Debug
import org.apache.ofbiz.base.util.UtilDateTime
+import org.apache.ofbiz.base.util.UtilFormatOut
import org.apache.ofbiz.base.util.UtilProperties
+import org.apache.ofbiz.entity.condition.EntityCondition
+import org.apache.ofbiz.entity.condition.EntityOperator
import org.apache.ofbiz.entity.GenericValue
MODULE = "PaymentServices.groovy"
@@ -57,3 +60,37 @@ def createPayment() {
result.paymentId = paymentId
return result
}
+
+def getPaymentRunningTotal(){
+paymentIds = parameters.paymentIds;
+runningTotal = 0;
+payments =
from("Payment").where(EntityCondition.makeCondition("paymentId",
EntityOperator.IN, paymentIds)).queryList()
+if (payments) {
+for (GenericValue payment : payments) {
+runningTotal = runningTotal + payment.amount;
+}
+}
+
+if (parameters.organizationPartyId) {
+serviceCtx = [
+organizationPartyId: parameters.organizationPartyId,
+userLogin: userLogin
+]
+serviceResult = dispatcher.runSync('getPartyAccountingPreferences',
serviceCtx);
+partyAcctgPreference = serviceResult.partyAccountingPreference;
+
+if (partyAcctgPreference.baseCurrencyUomId) {
+currencyUomId = partyAcctgPreference.baseCurrencyUomId;
+} else {
+currencyUomId =
UtilProperties.getPropertyValue('general.properties',
'currency.uom.id.default');
+}
+} else {
+currencyUomId = UtilProperties.getPropertyValue('general.properties',
'currency.uom.id.default');
+}
+
+paymentRunningTotal = UtilFormatOut.formatCurrency(runningTotal,
currencyUomId, locale);
+
+result = success()
+result.paymentRunningTotal = paymentRunningTotal
+return result
+}
diff --git a/applications/accounting/minilang/payment/PaymentServices.xml
b/applications/accounting/minilang/payment/PaymentServices.xml
index 3d6f961..3811bf7 100644
--- a/applications/accounting/minilang/payment/PaymentServices.xml
+++ b/applications/accounting/minilang/payment/PaymentServices.xml
@@ -512,27 +512,6 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/applications/accounting/servicedef/services_payment.xml
b/applications/accounting/servicedef/services_payment.xml
index ba0cacd..a7d9554 100644
--- a/applications/accounting/servicedef/services_payment.xml
+++ b/applications/accounting/servicedef/services_payment.xml
@@ -151,8 +151,8 @@ under the License.
-
+
calculate running total for payments
