Clone
 

thomas baccelli <thomas.baccelli@prestashop.com> in PrestaShop_v.1.5

Fix php coding style

  1. … 14 more files in changeset.
Update php-cs-fixer

Make PrestaShop compatible with composer 2.0

Fix help link in Create order

Use default_image instead of cover for product-images-modal

Call $moduleRepository->getModule only when needed

Do not call setTypeValue if id_feature url param is present

    • -1
    • +1
    /controllers/admin/AdminFeaturesController.php
Replace jQuery.attr() with jQuery.prop() for checked and disabled

Use Tools::getValue() instead of Tools::isSubmit() in count()

    • -1
    • +1
    /controllers/admin/AdminCarriersController.php
Fix exception when bulk deleting order return state without selection

    • -1
    • +7
    /controllers/admin/AdminStatusesController.php
Fix exception when bulk deleting order return state without selection

    • -1
    • +7
    /controllers/admin/AdminStatusesController.php
Use adapter Configuration

    • -2
    • +1
    /src/Adapter/Order/OrderAmountUpdater.php
Use adapter Configuration

    • -2
    • +1
    /src/Adapter/Order/OrderAmountUpdater.php
Do not recalculate shipping if PS_ORDER_RECALCULATE_SHIPPING is false

    • -3
    • +20
    /src/Adapter/Order/OrderAmountUpdater.php
Do not recalculate shipping if PS_ORDER_RECALCULATE_SHIPPING is false

    • -3
    • +20
    /src/Adapter/Order/OrderAmountUpdater.php
Fix OrderReturnState should not use soft delete

    • -0
    • +1
    /controllers/admin/AdminStatusesController.php
Fix OrderReturnState should not use soft delete

    • -0
    • +1
    /controllers/admin/AdminStatusesController.php
Fix out of stock check

Fix out of stock check

Round free gift discount amount

Round free gift discount amount

Calculate gift cart rules first

Calculate gift cart rules first

Rebuild assets

Fix free shipping cart rules not added/deleted in create order

Fix free shipping cart rules not added/deleted in create order

Write failing test

Write failing test

Fix merge error

Expose missing route