forked from PrestaShop/PrestaShop
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FO: Fix empty template var on json_encode #1
Open
lbanchio
wants to merge
42
commits into
develop
Choose a base branch
from
lbanchio-patch-1-1
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Owner
lbanchio
commented
Feb 4, 2017
Questions | Answers |
---|---|
Branch? | develop |
Description? | This patch fix empty templates variables when they are encoded in non utf-8 |
Type | bug fix |
Category | FO |
BC breaks | no |
Deprecations | no |
How to test? | Test with non utf-8 characters strings |
…artId-method Deprecate getOrderByCartId method, add alternative
Harmonize hook
(cherry picked from commit 22d299e)
Superfluous table alias
Add actionEmailSendBefore hook
Fix id_order ambiguous search
Add manufacturer name in cart products
Update invoice pdf
Calculate the carrier price with the REAL price customer is gonna pay, so have to use the BOTH_WITHOUT_SHIPPING const. By now the Discount is not use in the calculation. For exemple if you have a specific carrier price range for order > 50€ => free shipping. If the customer buy an 60€ item and use a -20% discount, customer gonna pay 48€ AND have the free shipping. I think it's not the expected functionment
Calculate carrier price on the real order price
This modification allows to give priority to the specificPrices with a specific id_cart. With this modification for example if a product is affected by two discounts, and one has the id_cart 0 and the orher the id_cart 3556, the second one will have more priority because it's more focused in this specific cart (cherry picked from commit 4312b61)
Improvement in SpecificPrice::getSpecificPrice
Update comment for jQuery migrate
(cherry picked from commit a1a26d6)
(cherry picked from commit 0302bd7)
Rename ESlint config file
Allow rel="nofollow" in anchors
(cherry picked from commit 0282c2b)
Update keyboard shortcuts in product page
Use boolean variables for tracking configuration value type
(cherry picked from commit 2c373f8)
Fix image doesn't exists
Add "use instead" doc on method display as deprecated when possible
Update ObjectModelCore::getFieldsLang
Fix Module configure permission
Fix Administering email setting whith/without log
44ee068
to
0ec6c6c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.