Commit Graph
63 Commits
Author SHA1 Message Date
Sebastian Berg 18b83b91c2 Fixed: Unable to add product (of ASSET_USAGE type) in order OFBIZ-10791
Thanks Priya for providing the patch
2021-02-15 17:56:35 +01:00
James Yong 816a2a6ac1 Reverted: apply buttontext class for links inside screenlet title bar (OFBIZ-12112)
Links not showing correctly for themes like Bluelight, Tomahawk.
This reverts commit 9d0e5313
2020-12-27 15:29:03 +08:00
James Yong 9d0e5313bc Improved: apply buttontext class for links inside screenlet title bar (OFBIZ-12112)
For Order application
2020-12-26 20:25:47 +08:00
Saurabh Dixit d28978def4 Fixed: Single product tile is displayed on one row in product search. (OFBIZ-12045) (#245)
Cause: Wrong use of bootstrap grid classes.
Fix: Used row class as a parent to col-* class while rendering the products.
2020-11-30 11:14:06 +01:00
Jacques Le Roux 60dd569529 Fixed: Handle special characters like single quote in Freemarker template (prevent encoding) (OFBIZ-12029)
A such case was reported by Amit Gadaley at
https://markmail.org/message/ybyjkngdiwrywut6
The solution is to use StringUtil.wrapString() to prevent encoding.
2020-11-10 11:09:46 +01: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
Akash Jain 98f495a79c Improved: adding product to purchase order auto assigned PRODUCT_ORDER_ITEM (OFBIZ-9339)
Thanks, Wai for report.
2020-09-01 21:06:15 +05:30
Jacques Le Roux 8a5107e498 Fixed: display/selection of unit of measure is broken (OFBIZ-11955)
Fixes UOM dropdown for products like WG-9943

Thanks: Alex
2020-08-31 10:46:00 +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 f5ef671703 Fixed: Default value flags not working for configurable and variant products at the time of order entry (OFBIZ-10532)
Thanks, Deepak Nigam for report.
2020-08-27 18:03:02 +05:30
Jacques Le Roux 7d6e5ddbb5 Improved: Hard coded label in ProductUomDropDownOnly (OFBIZ-11891)
The select label is not receiving translations.

There are more related issues, but this is independent.

Thanks: Alex Bodnaru
2020-07-16 14:34:22 +02:00
Priya SharmaandPriya Sharma a3059c097d [Implemented] Introduce the option for specifying Check (Reference) Number upon using Check as payment method during ordering (#203)
Done the following:
- Added a field on the UI to allow the input of the check reference number
- Added logic to set this reference number on the cartpaymentinfo map
- Added logic to fetch the reference number from the order preference record and apply it on the payment.

(OFBIZ-7377)

Co-authored-by: Priya Sharma <priya.sharma@hotwaxsystems.com>
2020-06-16 14:55:35 +05:30
James Yong e3e12ee487 Improved: No need to specify externalKeyParam in ofbizUrl calls (OFBIZ-11711)
Let ofbizUrl macro generates externalLoginKey when needed.

Thanks: Jacques for review
2020-05-17 20:37:48 +08:00
James Yong b17fd2419a Improved: Apply multi-block attr to each application (OFBIZ-11706)
For Order application.
2020-05-15 19:24:20 +08:00
akash 5d011d3226 Improvement: Quantity and Add to Cart button showing twice on Compare Products page
(OFBIZ-10665)

Thanks, Ritesh Kumar and Dikpal Kanungo for your contribution.
2020-02-22 11:26:29 +05:30
James Yong 05ffbd2817 Improved: Add 'controlPath' attribute to 'ofbizUrl' freemarker macro
(OFBIZ-11317)

Adding the controlPath attribute to allow the controls by ofbizUrl to support uri to other OFBiz web application.

Thanks: Jacques for the review
2020-01-12 22:25:50 +08:00
Jacques Le Roux 92a16f9980 Improved: Missing uiLabel for Create New on CMS Content Find Screen
(OFBIZ-11005)

Steps to regenerate:
    Go to https://demo-trunk.ofbiz.apache.org/content/control/CMSContentFind
    Find missing uiLabel for Create New, showing as CommonCreateNew.

jleroux: This is related with OFBIZ-9905, we decided to use only CommonCreate
This do that and fix others which were missing in OFBIZ-9905

Thanks: Pawan Verma for report, Suraj for comment


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858516 13f79535-47bb-0310-9956-ffa450edef68
2019-05-02 06:44:47 +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
Jacques Le Roux 8a139ca806 Fixed: partyId misses in EditEftAccount.ftl (party) when you create an EFT
account from the quick finalize page
(OFBIZ-10680)

If you split the payment and want to create an EFT account you get an error in 
EditEftAccount.ftl (party) at line 40 colum 50: the partyId is missing.

Adds the patch to add the partyId field that was missing while creating an EFT 
account or credit card in split payment mode. Added proper checks to avoid the 
broken screen in case the parameter is missing.

Thanks: Ankit Joshi for the fix

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851319 13f79535-47bb-0310-9956-ffa450edef68
2019-01-15 07:43:36 +00:00
Deepak Dixit d9bf61bf83 Fixed: Page dropdown list on categorydetail page broken
(OFBIZ-10787)
Thanks Sebastian Wachinger for reporting the issue.
Corrected the condition to display pagination options for ordermgr template as well.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851006 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 06:07:54 +00:00
Jacques Le Roux 356984ce4f Fixed: Dependent dropdowns should be used in createPostalAddress and
Set Billing screens of ordermgr.
(OFBIZ-10681)

If you create an EFT account from the quick finalyse page, at 
ordermgr/control/createPostalAddress the US states which are proposed by default 
are not the US states but all states. 
You still can pick one US state, but it's counter intuitive.

Thanks: Aman Mishra for the fix and finding of Set Billing screen

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1849567 13f79535-47bb-0310-9956-ffa450edef68
2018-12-22 19:18:49 +00:00
Jacques Le Roux 535062cd47 Fixed: Instructions for Configurable PC don't work
(OFBIZ-10542)

This concerns only R16, R17 and the trunk. The "Instructions" button was not 
present in R13.

This kind of message shows:
Trunk:
<a href="javascript:showErrorAlert('The following errors occurred','');"
R16:
<a href="javascript:showErrorAlert(" the="" following="" errors="" occurred","")

The same exists for all configurable products, notably Gold Pizza

Thanks: Priya Sharma

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1847398 13f79535-47bb-0310-9956-ffa450edef68
2018-11-25 08:40:23 +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
Jacques Le Roux b6e15931f6 Improved: 'Reserve After Date' should be available for sales orders only
(OFBIZ-10559)

Currently, the newly introduced in (OFBIZ-10534) 'Reserve After Date' field is 
available for all types of orders, it should be available for sales orders only.

jleroux: I have also handled in when editing items

Thanks: Deepak Nigam

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1840631 13f79535-47bb-0310-9956-ffa450edef68
2018-09-12 07:48:39 +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
Jacques Le Roux ef1dbfc169 Improved: UI for all promotions listing disturbed
(OFBIZ-10462)
The "checkout section" in the ecommerce main page is not easily legible
(OFBIZ-10414)

Steps to regenerate the issue are as follows:
1) Navigate to storefront
2) Click on "View All Promotions" button.

Expected:
All promotions should be in a listed format.

Actual:
All promotions are listed inline.

jleroux: I also added a space after uiLabelMap.CommonDetails in 
ShowAllPromotions template in order

This also improves OFBIZ-10414

Thanks: Pritam Kute

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1840263 13f79535-47bb-0310-9956-ffa450edef68
2018-09-06 20:42:10 +00:00
Jacques Le Roux 1c73989942 Implemented: 'Reserve After Date' for order items
(OFBIZ-10534)

While creating orders from the backend, we have the option to set parameters 
like 'Ship After Date' and 'Ship Before Date' to manage the fulfilment cycle 
more efficiently. 

Inventory gets reserved for the product based on a FIFO basis. Sometimes the 
fulfilment time for the order is high and inventory unnecessarily gets locked 
for some time period.
 
We can introduce a new parameter (at order item level) 'Reserve After Date' 
which will indicate the date only after which reservation can happen. 
In this way, we can manage the stock availability more efficiently.
 
This issue relates to OFBIZ-10518

Thanks: Deepak Nigam  for the effort, Deepak Dixit for a review and suggestions

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1839914 13f79535-47bb-0310-9956-ffa450edef68
2018-09-03 08:15:08 +00:00
Deepak Dixit 2fe25b3d79 Improved: Replace #assign with #local in all the ftl macros
(OFBIZ-10516)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1837830 13f79535-47bb-0310-9956-ffa450edef68
2018-08-10 18:49:03 +00:00
Deepak Dixit ef0c694a46 Improved: Use application/javascript instead of text/javascript
(OFBIZ-10492)
Replace text/javascript with application/javascript in all the script tag

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1836886 13f79535-47bb-0310-9956-ffa450edef68
2018-07-28 10:51:52 +00:00
Deepak Dixit 397628ba7d Improved: Remove use of deprecated language attribute from script tag
(OFBIZ-10491)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1836545 13f79535-47bb-0310-9956-ffa450edef68
2018-07-24 11:26:23 +00:00
Deepak Dixit 66b783ca75 Improved: Improve Order layout.
(OFBIZ-10331)
Applied slightly modified patch from jira ticket, Thanks Dennis Balkir for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1835889 13f79535-47bb-0310-9956-ffa450edef68
2018-07-14 09:28:04 +00:00
Nicolas Malin 7f8189de69 Implemented: Use agreement on drop shipment process (OFBIZ-10227)
Extend the drop shipment process to manage an agreement for the supplier related to the order context.
For a supplier we have different agreements with same products but on different prices

Agreement A
  GIZMO-1 100€
  GIZMO-1 110$
Agreement B
  GIZMO-1 90€
Agreement C
  GIZMO-1 600¥

During sales order process we resolve the purchase agreement that match the case and put on OrderItemShipGroup related to the supplier. Like that when the drop shipment process run it to resolve the product price for the agreement present on the OrderItemShipGroup. With this implementation we have an adaptable system to manage complex case.

Properly this patch implemented :
  an attribute on entity OrderItemShipGroup.supplierAgreementId
  an attribute on entity OrderHeader.agreementId (necessary when you update the order to keep the price)
  update the service caculatePurchasePrice for resolve the price from a agreement if it's present
  update the shoppingCart to insert a purchase agreement

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1825002 13f79535-47bb-0310-9956-ffa450edef68
2018-02-21 20:40:53 +00:00
Jacques Le Roux 5fe9050ae2 Fixed: pagination errors in "KeywordSearch.ftl" and "ProductSearchSession.java"
(OFBIZ-10154)

To recreate the bug go to
Order->OrderEntry-> Search in the catalog for "g" -> check the amount of shown 
pages and press "Next" -> press "back" -> note how many results you now have

Thanks: Karsten Tymann

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1821012 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 18:21:38 +00:00
Nicolas Malin 2825a35b79 Fixed: Display the included vat amount on order item detail instead of 0 (OFBIZ-10148)
When you use a product price with included vat tax, the orderAdjustment created have an amount to 0 but amount already included with the vat.

When we display the order adjustment detail for an order item we use only amount (so 0).

Now if the orderAdjustment have an amountAlreadyIncluded not empty, we display it instead.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820403 13f79535-47bb-0310-9956-ffa450edef68
2018-01-06 14:58:14 +00:00
Arun Patidar 5742dc0ea5 Improved: 'Order Entry Payment Settings' should not be hard coded (OFBIZ-9618)
Thanks Renuka Srishti for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1819131 13f79535-47bb-0310-9956-ffa450edef68
2017-12-23 10:23:34 +00:00
Jacques Le Roux c000543cce Improved: Use ofbizCurrency macro and remove hardcoded ##0.00 string
(OFBIZ-9675)

ofbizAmount macro can be used.

jleroux: while applying the patch I noticed the use of ?default(0) where the 
newer and simpler !0 could be used. Rather than only replacing this case here
I'll create a Jira and replace all such cases generalising to any value (that's
a lot: 1394 case!)

Thanks: Renuka Srishti and Ritesh Kumar

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1816291 13f79535-47bb-0310-9956-ffa450edef68
2017-11-25 12:50:25 +00:00
Deepak Dixit d310aaf2cd Improved: Inconsistent String Comparisons, Applied patch for ftl file.
Thanks Devanshu Vyas for your contribution. (OFBIZ-9254)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812285 13f79535-47bb-0310-9956-ffa450edef68
2017-10-16 11:31:40 +00:00
Arun Patidar c0d7847cfc Fixed: Missing productId in input field after Atp/Qoh button is clicked on create PO screen. (OFBIZ-9470)
Thanks Pallavi for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801319 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 20:06:38 +00:00
Arun Patidar 6fd5fd2546 Fixed: UI issue in ATP/QOH table on Create Purchase Order screen. (OFBIZ-9468)
Thanks Pallavi for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801318 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 19:52:35 +00:00
Deepak Dixit 8895181ce5 Fixed: add gift certificate in purchase order cause exception (OFBIZ-9438)
Apply slightly modified patch from jira issue.
Thanks Wai and Pallavi for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801274 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 10:59:18 +00:00
Jacopo Cappellato 727101dfc2 Fixed: removed explicit includes of HtmlTemplate.ftl from FreeMarker templates
since this has been deprecated and it is no more supported.
(OFBIZ-9325)

Improved the nextPrev macro by moving some logic from the template to the macro.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1792018 13f79535-47bb-0310-9956-ffa450edef68
2017-04-20 06:38:20 +00:00
Jacques Le Roux 509b92eb55 Fixed: The ecommerce breadcrumb fails when you come from the catalog product
link
(OFBIZ-9234)

To reproduce
# Get to https://demo-stable.ofbiz.apache.org/catalog/control/EditProduct?productId=GZ-1000
# Click on the "Product Page" button

You may notice an error which does appear erratically but most of the time, 
same on trunk demo and locally. 

This happens because sometimes the _BREAD_CRUMB_TRAIL_ session attribute is 
empty or null. "Why not alway?" you might ask. I had no time to investigate but 
I guess because there is no bread crum trail when coming from catalog, and for 
some weird reasons, it's sometimes there.

Anyway my fix is simple, if there is no _BREAD_CRUMB_TRAIL_  in session 
I bypass the bread crum block in BreadCrumbs.ftl. It's not perfect but look far 
better



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1784708 13f79535-47bb-0310-9956-ffa450edef68
2017-02-28 10:02:25 +00:00
Jacques Le Roux f0ae93810a Fixed: add item to order cause exception
(OFBIZ-9167)

-go to https://localhost:8443/ordermgr/control/orderentry
-create order for DemoCustomer
-add an item

console output...
java.lang.NullPointerException
        at org.apache.ofbiz.content.content.ContentWorker.
renderContentAsText(ContentWorker.java:368) ~[ofbiz.jar:?]
[...]

While at it I also found issues with cartLine.getName() in ftl files. It was
also missing the dispatcher. 

This was broken by OFBIZ-9164

Thanks: Wai

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1778889 13f79535-47bb-0310-9956-ffa450edef68
2017-01-15 07:37:35 +00:00
Pranay Pandey de4285f56b Improved: Order: Remove inline js for toggleAll, checkToggle and selectAll calling from ftls.
(OFBIZ-7896)

Remove inline js for toggleAll, checkToggle and selectAll calling from ftls in Order component instead, added class="selectAll" on parent checkbox element for select all functionality.

Thanks: Amardeep Singh Jhajj for the contribution.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761180 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 10:32:21 +00:00
Ashish Vijaywargiya 36ca614ab6 Applied patch from jira issue - OFBIZ-8035 - Clean up commented out code in Free Marker Template for Order.
Thanks Aman for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758023 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 13:08:18 +00:00
Deepak Dixit 834691742b (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Ashish Vijaywargiya e1e45da5ed Applied patch from jira issue - OFBIZ-7705 - Remove Google Checkout component from specialpurpose as it was discontinued.
Thanks Ravi for removing the reference of Google Checkout from everywhere.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751393 13f79535-47bb-0310-9956-ffa450edef68
2016-07-05 04:24:53 +00:00
Divesh Dutta afe4fc661a [OFBIZ-7580] Order Component: Checkbox and Radio buttons should get selected on clicking upon their labels. Thanks Mohammad Kathawala for your patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751342 13f79535-47bb-0310-9956-ffa450edef68
2016-07-04 16:50:38 +00:00
Divesh Dutta 27af468eda [OFBIZ-7484] Improved the distortion in UI of payment section when there is a billing account present for a customer while placing a sales order. Thanks Mohammad Kathawala for suggesting the improvement and providing the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750888 13f79535-47bb-0310-9956-ffa450edef68
2016-07-01 08:32:45 +00:00
Nicolas Malin 043d97bb49 no functional change: remove tabs introduce on commit 1750491 and finalize convert and remove unneeded end line space
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750509 13f79535-47bb-0310-9956-ffa450edef68
2016-06-28 13:51:37 +00:00