Commit Graph
77 Commits
Author SHA1 Message Date
Sebastian Berg 11634ae08c Improved: Converted OrderDeliveryServices.xml minilang to groovy
(OFBIZ-11461)
2021-02-04 17:46:55 +01:00
Daniel Watford edd7960e4b Fixed: Use data url scheme for logo in CompanyHeader
(OFBIZ-7327)

Use a data URL rather than a regular URL for company logos when a
logo has been specified as a Party Content item. This works around the
problem of Apache FOP failing to retrieve content from HTTPS URLs.

Thanks: Deepak Dixit for the review and suggestions
2021-01-24 16:26:34 +00:00
Nicolas Malin 2ddde9fb6b Fixed: OrderId with null value on refresh init base
(OFBIZ-12076)

After a fresh data base init with only seed, if you create your company without order prefix, your orderId sequence will be generate with 'null' string where the order prefix should be have :

> null10001, null10002, ...

This come from the groovy migration of service 'getNextOrderId' where productStore.orderNumberPrefix is loaded on the sequence without control if is empty or not
2020-11-30 09:48:41 +01:00
Jacques Le Roux 252c227ad0 Fixed: variant product selection trashes image (OFBIZ-12019)
The variant products' images are being saved in the variable IMG encoded as urls,
thus selecting the variant triggers an image override with an unsuitable file name.

Thanks: Alex Bodnaru
2020-10-06 15:18:49 +02:00
Jacques Le Roux d04f777389 Fixed: display/selection of unit of measure is broken (OFBIZ-11955)
Improve code for UOM dropdown of products like WG-9943

Thanks: Alex
2020-09-11 10:43:13 +02:00
Jacques Le Roux 9a957eb7a7 Fixed: display/selection of unit of measure is broken
(OFBIZ-11955)

This fixes in in order component

Thanks: Alex
2020-08-30 14:13:10 +02:00
Akash Jain 64b415e0d2 Improved: Expired product images showing on product detail page (OFBIZ-11982) 2020-08-25 21:41:31 +05:30
Pawan Verma 034e03abf4 Improved: Inconsistent String Comparisons(OFBIZ-9254)
There are some inconsistencies in the code for string comparison statusId.equals(PRUN_COMPLETED) whereas it should be written as PRUN_COMPLETED.equals(statusId) cause the former can throw NullPointerException if the variable found to be NULL.

Thanks: Devanshu for your contribution.
2020-07-30 17:01:54 +05:30
Pawan Verma efc016e5c9 Fixed: BigDecimal casting in Groovy (OFBIZ-11862)
Sometimes use wrong type castings for BigDecimal:

Used BigDecimal.ZERO and BigDecimal.ONE instead.
2020-07-03 14:08:14 +05:30
Suraj Khurana d58ffe1e8e Fixed: Console warnings related to OrderHeader caching.
(OFBIZ-11858)
Thanks Praveen Sharma for the patch and Jacques for review.
2020-07-02 10:55:55 +05:30
Jacques Le Roux 4bf23fdd9c Fixed: BigDecimal casting in Groovy (OFBIZ-11862)
Fixes syntax errors introduced by my previous commit
2020-06-30 18:42:43 +02:00
Jacques Le Roux df179777b6 Fixed: BigDecimal casting in Groovy (OFBIZ-11862)
Sometimes use wrong type castings for BigDecimal:

I have observed that for typecasting in groovy, we have used the wrong coding
pattern like

(BigDecimal) 0
It should be like
0 as BigDecimal

Note that this does not apply to decimal because in case of decimal, the default
type is always BigDecimal in Groovy.

Thanks: Pritam Kute for spotting the issue in OFBIZ-11843
2020-06-30 15:17:47 +02:00
pritambkuteandPritam Kute a7fa31c403 Fixed the issues in accept return process. (OFBIZ-11843) (#211)
Co-authored-by: Pritam Kute <pritam.kute>
2020-06-27 18:32:56 +05:30
Jacques Le Roux 7342f35d6f Fixed: IDOR vulnerability in the order processing feature in ecommerce component (OFBIZ-11836)
Fixes a bug when there are no problem viewing the order, my bad
2020-06-27 10:43:02 +02:00
Jacques Le Roux 4f841e9897 Fixed: IDOR vulnerability in the order processing feature in ecommerce component (OFBIZ-11836)
https://demo-stable.ofbiz.apache.org/ecommerce/control/order.pdf?orderId=WSCO10000

In the above URL, the parameter 'orderId' has the value 'WSCO10000' and after
incrementing the value to 'WSCO10001' or 'WSCO10002' will download the receipt
of other orders which have been placed by other users.

All the available order receipts can be downloaded by running an automated tool
(Burp Intruder) on the parameter 'orderId=WSCOXXXXX'

I have successfully tested this by using 2 different accounts: DemoCustomer and
DemoCustomer2

An attacker can download order receipts of other users and this could lead to
information disclosure.

The only real solution to this issue is to implement access control. The user
needs to be authorized for the requested information before the server provides
it.

Thanks: Harshit Shukla [mailto:harshit.shukz@gmail.com]reported this IDOR
vulnerability to the OFBiz security team, and we thank him for that.
2020-06-26 09:28:49 +02:00
Gil Portenseigne 7c8aab3d9d Improved: Migrate checkCreateOrderRequirement service to groovy
(OFBIZ-9984)

This commit migrate also dependent method and remove createRequirementFromItemATP service
2020-06-19 16:59:00 +02:00
Priya SharmaandPriya Sharma 15aec7e8f7 WIP: [Improved]: Use GroovyBaseScript's logging utility methods instead of using Debug (OFBIZ-11762) (#185)
* [Improved]: Use GroovyBaseScript's logging utility methods instead of using Debug
- Replaced the debug.log methods with the respective groovy utility method
- Enhanced the GroovyBaseScript to entertain the fetch the current class name as the module name for logging
- Overloaded the logError method to entertain throwbale object for better logging
- Removed unused import statements and module variables.

(OFBIZ-11762)

* [Removed]: Extra line spaces. (OFBIZ-11762)

* [Revert]: Unwanted changes. (OFBIZ-11762)

* [Added] Same changes to these files. (OFBIZ-11762)

Co-authored-by: Priya Sharma <priya.sharma@example.com>
2020-06-06 10:17:23 +02:00
Nicolas Malin f6418d52f5 Improved: Convert OrderReturnService.xml from mini lang to groovy
(OFBIZ-11442)

Thanks to Sebastian Berg for providing the patch
2020-04-08 14:25:00 +02:00
Gil Portenseigne b79c95b151 Fixed: Convert OrderServices.xml mini-lang to groovyDSL : getNextOrderId
(OFBIZ-9984)
Fix introduced NPE detected by the introduced test.
2020-03-06 17:36:14 +01:00
Gil Portenseigne 53a8b81260 Improved: Convert OrderServices.xml mini-lang to groovyDSL : getOrderedSummaryInformation
(OFBIZ-9984)
Thanks Julien for your contribution
2020-03-06 15:47:52 +01:00
Gil Portenseigne eba4157c59 Improved: Convert OrderServices.xml mini-lang to groovyDSL : getNextOrderId
(OFBIZ-9984)
Thanks Julien for your old patch, it has been improved.
Add a new integration test for the service 'getNextOrderId'
2020-03-06 15:46:58 +01:00
Mathieu Lirzin d0f522aeed Fixed: Remove obsolete references to WorkflowActivity (OFBIZ-11303)
The workflow component is in attic since 7 years.
2019-12-01 20:05:27 +01:00
Jacques Le Roux 531793820e Improved: Add a discussion feature in order detail view for following
communication about the order (mail, phone etc.)
(OFBIZ-11210)

This is in order detail view for following communication about the order 
(mail, phone etc.) to keep an eye about all com' event linked to the order.

Thanks: Carl Demus

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867581 13f79535-47bb-0310-9956-ffa450edef68
2019-09-26 15:11:52 +00:00
Gil Portenseigne 763911235c Improved: Get correct information history for Company Header in pdf document
(OFBIZ-11177)

CompanyHeader.groovy now use the rendered document date 
as a reference to retrieve company data.

Thanks Carl Demus for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1866511 13f79535-47bb-0310-9956-ffa450edef68
2019-09-06 14:44:01 +00:00
Nicolas Malin cbc0a76517 Improved: Find order screen can't make a search without ship to country
(OFBIZ-11176)
When you search orders on the standard screen [1] you can't unselect a country.
The problem come from the populate country list by countries.ftl who select by default a country without possibility to escape it.
We added a possibility to escape it through variable doNotPreselectDefaultCountryGeoId 

[1] https://localhost:8443/ordermgr/control/findorders

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1866012 13f79535-47bb-0310-9956-ffa450edef68
2019-08-27 21:30:58 +00:00
Mathieu Lirzin 9b68a55d64 Improved: Compile groovy integration tests
(OFBIZ-11165)

Since there is no need for dynamic reload for integration tests,
it is better to compile Groovy tests.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1865786 13f79535-47bb-0310-9956-ffa450edef68
2019-08-23 18:00:01 +00:00
Jacques Le Roux be99f5a0a7 Improved: no functional change
Adds missing ASL2 headers, thanks to Mathieu on dev ML :)
Also automatically sorts imports

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1862214 13f79535-47bb-0310-9956-ffa450edef68
2019-06-27 14:03:34 +00:00
Suraj Khurana 2b26ec3574 Improved: Unit test case for service - CheckCreateStockRequirementQoh.
(OFBIZ-8939)
Thanks Avnindra Sharma for reporting the ticket and Anushi Gupta for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1861858 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 12:15:45 +00:00
Deepak Nigam 5e6c96d8bb Implemented: The feature where a user will be able to add different types of content(image, document, URL, etc.) to an order.
(OFBIZ-7257)
Here is an implementation plan for the proposed solution. 
Order Attachment Flow:
1) Show 'Attachments' instead of 'Image' on the order view screen.
2) If there are any attachments associated with the order, then their information will be displayed in the form of a button(Content link) else 'No Attachment' label should be shown.
3) If no attachments are there, then along with the label, a button(Add Attachment) will be displayed.
On clicking the Add Attachment button, a user will be redirected to a page where he/she can add different types of content(image, document, URL, etc.) to the order.
Order Attachment Modeling:
Used OrderContent as the entity to store the content and order association.
Created OrderContentType data for an image and document for starters.

Thanks Avnindra Sharma for reporting the original issue, Devanshu Vyas for providing the patch and Jacques for review and suggestions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1861853 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 12:06:43 +00:00
Suraj Khurana 10ef90f819 Improved: Unit test case for service - GetReturnAmountByOrder.
(OFBIZ-8861)
Thanks Avnindra Sharma for reporting and Yogesh Naroliya for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1861814 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 05:31:11 +00:00
Suraj Khurana c55deb8c04 Improved: JUnit test case for Creating a Retrun Header.
(OFBIZ-8808)
Committing slightly modified patch.Thanks Avnindra Sharma for reporting and Yogesh Naroliya for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1861813 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 05:14:07 +00:00
Suraj Khurana 9eaa7bde93 Improved: Unit test case for service - CreateReturnStatus.
(OFBIZ-8860)
Thanks Avnindra Sharma for repoting and Yogesh Naroliya for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1861682 13f79535-47bb-0310-9956-ffa450edef68
2019-06-20 10:16:22 +00:00
Jacques Le Roux 08f0b84462 Improved: no functional change, adds missing license headers
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1860902 13f79535-47bb-0310-9956-ffa450edef68
2019-06-09 13:08:08 +00:00
Jacques Le Roux 28e119027c Improved: Use Groovy Truth instead of UtilValidate Class in Groovy
(OFBIZ-11064)

As we all know, Groovy is a powerful language with great built-in functions. 
Groovy Truth[1] is one of them, which is not used properly in our code base. 
We have used UtilValidate Class to validate arguments for Empty or NotEmpty, 
which can easily be done in groovy with built-in functionality[1].
 
Current Code: if (UtilValidate.isNotEmpty(locations)) { ... }
Groovy Built-in Code: if (locations) { ... }
 
[1] - http://groovy-lang.org/semantics.html#Groovy-Truth
 
We need to careful for some points while we change this:
Like:
maxRetry = 0
if (!maxRetry)
{  // Not set, use a default  maxRetry = -1 }

Because groovy evaluates zero to be false, it wouldn't be possible to set
maxRetry to zero.  So it's best not to use groovy truth for null-checks on
numbers in some cases. 
 
Thanks: Pawan Verma

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1860051 13f79535-47bb-0310-9956-ffa450edef68
2019-05-26 10:36:16 +00:00
Suraj Khurana 5dfb8a24cd Improved: Unit test case for service - CreateReturnItemShipment.
(OFBIZ-8859)
Thanks Avnindra Sharma for reporting the issue and Yogesh Naroliya for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1860005 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 16:45:44 +00:00
Suraj Khurana 6ad72737b7 Improved: Unit test case for service - CheckCreateProductRequirementForFacility.
(OFBIZ-8937)
Thanks Avnindra Sharma for reporting the issue and Anushi Gupta for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1860004 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 16:35:56 +00:00
Suraj Khurana 52d8436640 Improved: Used more declarative style for the context map, preferring map literals over imperative map.
(OFBIZ-8853)
Thanks Mathieu Lirzin for your suggestion.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1860003 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 16:28:28 +00:00
Suraj Khurana e51b05e01d Improved: Unit test case for service - CheckPaymentAmountForRefund.
(OFBIZ-8852)
Thanks Avnindra Sharma for reporting the issue and Yogesh Naroliya for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1860000 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 15:50:49 +00:00
Suraj Khurana 0e3ebf957f Improved: Unit test case for service - CheckReturnComplete.
(OFBIZ-8853)
Thanks Avnindra Sharma for reporting the issue and Yogesh Naroliya for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1859999 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 15:48:08 +00:00
Suraj Khurana fa95a9403c Improved: Unit test case for service - CreateReturnAndItemOrAdjustment.
(OFBIZ-8858)
Thanks Avnindra Sharma for reporting the issue and Yogesh Naroliya for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1859994 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 15:38:44 +00:00
Suraj Khurana b8940f0e1d Improved: Unit test case for service - quickReturnOrder.
(OFBIZ-8809)
Thanks Avnindra Sharma for reporting the issue and Yogesh Naroliya for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1859992 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 15:34:59 +00:00
Suraj Khurana 443bac5d8f Improved: Added support for Inventory (Supply) Allocation Planning.
(OFBIZ-10518)
Thanks Deepak Nigam for initiating this feature and providng the patches, Arun Patidar for review and Swapnil Shah for design discussions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858270 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 13:05:30 +00:00
Suraj Khurana 362f154b74 Added: Unit test case for service - CreateReturnAdjustment.
(OFBIZ-8857)
Thanks Avnindra Sharma for reporting, Pawan Verma for discussion and Vivek Singh Bisen for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1856609 13f79535-47bb-0310-9956-ffa450edef68
2019-03-30 07:12:25 +00:00
Suraj Khurana 039dfbf5fa Added: Unit test case for service - AddRequirementTask.
(OFBIZ-8931)
Thanks Avnindra Sharma for reporting and Pawan Verma for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1856596 13f79535-47bb-0310-9956-ffa450edef68
2019-03-30 05:13:33 +00:00
Jacques Le Roux 9712ec2963 Improved: function parseBigDecimalForEntity is in wrong location
(OFBIZ-10689)

After I changed the method name from  ObjectType::simpleTypeConvert to
ObjectType::simpleTypeOrObjectConvert, Shikha Jaiswal noticed that I missed 
the groovy files.

Checking further I found that I also missed the simple-methods.xsd and 
ObjectTypeTests.java (though this last one was no really a problem)

Thanks: Shikha Jaiswal 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851156 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 09:29:29 +00:00
Suraj Khurana 80c659bbee Added:Unit test case for service - CustRequestPermissionCheck.
(OFBIZ-8958)
Thanks Avnindra Sharma for reporting, Deepak Nigam and Yogesh Naroliya for providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851143 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 06:51:13 +00:00
Nicolas Malin 98814e5c03 Improved: Convert QuoteServices.xml mini lang to groovy - Deprecate Mini Lang
(OFBIZ-10553) (OFBIZ-9350)
Convert all QuoteServices.xml and their xml test
Thanks to Antoine Ouvrard, Leila Mekika, Gil Portenseigne and Mathieu Lirzin for this team work to convert all function and tests case

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1849800 13f79535-47bb-0310-9956-ffa450edef68
2018-12-27 14:40:03 +00:00
Nicolas Malin c7d7b23144 Improved: Migrate from minilang to entity-auto createQuoteWorkEffort et deleteQuoteWorkEffort.
(OFBIZ-10553)
But createQuoteWorkEffort is not a crud service on entity QuoteWorkEffort because it is linked to a seca to call createWorkeffort before if a workEffortId is not present in context.

<eca service="createQuoteWorkEffort" event="in-validate">
   <condition field-name="workEffortId" operator="is-empty"/>
   <action service="createWorkEffort" mode="sync"/>
</eca>

I converted this service createQuoteWorkEffort has a real Crud service and create an other ensureWorkEffortAndCreateQuoteWorkEffort to simulate the attendee process. Now we have a coherent service naming and not surprise for developer .
To manage the service createQuoteWorkEffort as deprecated, I define it twice

     <service name="createQuoteWorkEffort" default-entity-name="QuoteWorkEffort" engine="entity-auto" invoke="create" auth="true">
        <deprecated use-instead="ensureWorkEffortAndCreateQuoteWorkEffort" since="Upcoming Release">
            use createQuoteWorkEffort to create a workeffort has been deprecated for best pratice naming reason, use ensureWorkEffortAndCreateQuoteWorkEffort instead.
            Now createQuoteWorkEffort work as a crud service on QuoteWorkEffort
        </deprecated>
    </service>
    <service name="createQuoteWorkEffort" default-entity-name="QuoteWorkEffort" engine="entity-auto" invoke="create" auth="true">
        <description>Create a new QuoteWorkEffort</description>
        <required-permissions join-type="AND">
            <check-permission permission="ORDERMGR" action="_CREATE"/>
        </required-permissions>
        <auto-attributes mode="IN" include="pk"/>
     </service>

First to alert on deprecation and second ensure that the definition work fine.
In log we will have an alert on the deprecation and an alert on the duplicated definition during the deprecation time.

Thanks to Antoine Ouvrard, Gil Portenseigne, Leila Mekika and Mathieu Lirzin for their review

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1847056 13f79535-47bb-0310-9956-ffa450edef68
2018-11-20 20:19:34 +00:00
Jacques Le Roux 3190e0ff2e Improved: Create patch for removal of IDEAL code in framework
(OFBIZ-5444)

Removes all iDEAL specifics from the framework (actually only applications)

Thanks: Pierre Smits

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1846227 13f79535-47bb-0310-9956-ffa450edef68
2018-11-09 10:20:10 +00:00
Nicolas Malin 5dff2f648a Implemented: Calculate estimated shipment delivery time
(OFBIZ-10372)
Currently when you pass an order in ofbiz you can select the shipment method to delivery finish good and obtains an amount cost but you have nothing to indicate how the delivration will during.
We have a good example with ship by plane or boat and for road the time is different between the Portugal to Spain and Portugal to Slovenia.

With this information, we can planned the estimated delivery date with the estimated date to produce finish good and the time to delivery them

To fill this gap, we introduce a new entity ShipmentTimeEstimate modelled as ShipmentCostEstimate to define the estimated time for a shipment method, a carrier and two geo location.
During the entry order process, if you select a shipmentMethod, a carrier and geoIds that match a ShipmentTimeEstimate, when you create the order, OFBiz try to resolve the an estimated delivery date from estimatedShipDate, shipBeforeDate, shipAfterDate or now.

Thanks Leila Mekika for initialize this works, Gil Portenseigne for improve the solution and Suraj Khurana for the review

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1840579 13f79535-47bb-0310-9956-ffa450edef68
2018-09-11 14:36:08 +00:00