Merge pull request #14425 from matks/merge176xtodevelop-30

Merge 1.7.6.x to develop - 28/06/2019

CONTRIBUTORS.md

@@ -3,6 +3,7 @@ GitHub contributors:
 - (d)oekia
 - 0kph
 - 123monsite-regis
+- 202 ecommerce
 - 1RV34
 - Abdelaziz JRIBI
 - Adam
@@ -482,6 +483,7 @@ GitHub contributors:
 - Oleg Rumyancev
 - Olivier Bonvalet
 - Olivier Monaco
+- OneDotIT
 - Oskar Andersson
 - Otto Nascarella
 - Pablo Borowicz

admin-dev/themes/new-theme/js/app/utils/datepicker.js

@@ -33,7 +33,40 @@ const init = function initDatePickers() {
   $('.datepicker input[type="text"]').datetimepicker({
     locale: global.full_language_code,
     format: 'YYYY-MM-DD',
-  });
+  })
+  .on('dp.show', replaceDatePicker)
+  .on('dp.hide', function() {
+    $(window).off('resize', replaceDatePicker);
+  })
+  ;
+
+  function replaceDatePicker() {
+    const datepicker = $('body').find('.bootstrap-datetimepicker-widget:last');
+    if (datepicker.length <= 0) {
+      return;
+    }
+
+    const position = datepicker.offset(),
+      originalHeight = datepicker.outerHeight(),
+      margin = (datepicker.outerHeight(true) - datepicker.outerHeight()) / 2
+    ;
+
+    // Move datepicker to the exact same place it was but attached to body
+    datepicker.appendTo('body');
+
+    //Height changed because the css from column-filters is not applied any more
+    const top = position.top + originalHeight - margin - datepicker.outerHeight();
+
+    datepicker.css({
+      position: 'absolute',
+      top: top,
+      bottom: 'auto',
+      left: position.left,
+      right: 'auto'
+    });
+
+    $(window).on('resize', replaceDatePicker);
+  }
 };
 
 export default init;

admin-dev/themes/new-theme/scss/components/_grid.scss

@@ -146,8 +146,8 @@ table .column-filters td:last-child .grid-reset-button {
       }
     }
   }
-  .table-responsive {
-    overflow-x: inherit;
+  .table-responsive .row {
+    margin: 0;
   }
 }
 

admin-dev/themes/new-theme/scss/theme.scss

@@ -55,7 +55,6 @@
 @import "pages/themes_logo";
 @import "pages/cms_page";
 @import "pages/employee";
-@import "pages/customer";
 
 // Main Layout
 @import "pages/modules";

docs/CHANGELOG.txt

@@ -24,6 +24,101 @@ International Registered Trademark & Property of PrestaShop SA
 Release Notes for PrestaShop 1.7
 --------------------------------
 
+####################################
+#   v1.7.6.0 RC 1 - (2019-06-25)
+####################################
+- Back Office:
+  - Improvement:
+    - #14239: Introduce the usage of Module user-displayable exceptions to handle module errors (part 2)
+    - #14008: Adds missing form data arguments in hooks
+    - #13779: Allow to overwrite theme mails if they have modules OR mail templates
+    - #13722: Filter themes without override in email generation form
+  - Bug fix:
+    - #14364: View button doesn't have href
+    - #14331: Handle bad theme error nicely
+    - #14290: Extend customer page
+    - #14259: Avoid bug when creating manually created a language
+    - #14248: Cannot use accented URL with arabic language
+    - #14242: Module form_rest() outside div
+    - #14220: Set schema form rendered when it contains no children
+    - #14189: Fix manufacturer controller using wrong DomainException ns
+    - #14172: Add missing form_errors for identifiable object forms
+    - #13984: Fix bo categories
+    - #14152: Adjust employee avatar size
+    - #14156: Add missing null check in EditCmsPageHandler
+    - #14101: Fix missing permission roles
+    - #14137: Adds missing form_rest in Shop Parameters > Preferences
+    - #14107: Do not allow the selection of any subcategories
+    - #14084: Fixes updating name and symbol for currency
+    - #14021: Improved error handling when theme is uploaded or activated
+    - #14091: Do not use specific prices when displaying price with tax in BO product catalog
+    - #14029: Missing legacy link for themes page
+    - #14028: Add explanations about SEO cards
+    - #14030: Add missing legacy link for translations routes
+    - #13875: Added help property (backported from Symfony 4 framework)
+    - #14007: Fix currency precision from CLDR at install
+    - #13774: Includes missing theme & logo page validation handling for logo and icon images
+    - #13916: Fixes saving private note about customer from order page
+    - #13820: Fixes form_rest placing
+    - #13956: Restore legacy controller and template files deleted late in beta
+    - #13840: Fix resetting sort and items per page on list filters reset action
+    - #13887: Fix saving customer with required fields
+    - #13813: Fixes toggling Category status in Monitoring page
+    - #13866: Fix cart rule calculation for free gift
+    - #13857: Missing legacy links fix for employess controller
+    - #13797: Adds missing legacy links for currency controller
+    - #13777: Incorrect translation arguments passed in cms page form
+    - #13690: Theme and logo page design fixes
+    - #13821: Fix manufacturers, taxes lists id filtering
+    - #13165: Fix multilanguage fields configuration
+    - #13764: Fixes customer view url in notifications bar
+    - #13763: Fix help sidebar display in Customers page
+    - #13765: Fix sql manager bulk actions
+
+- Front Office:
+  - Improvement:
+    - #14180: Improve right block on cart and checkout page
+    - #14138: Add comment in Customer registration form, add better error message
+  - Bug fix:
+    - #14325: Refresh product flags on ajax call when product page is refreshed
+    - #14298: Fix english mail generation on fresh install
+    - #14309: Simplify the installation language to its minimum
+    - #14296: Fix carrier display in order confirmation email
+    - #14251: Fix categories wordbreak
+    - #14190: You need to be authenticated to play with addresses
+    - #14166: Fix categories cover images which had an incorrect format
+    - #14163: Add missing quotes in error message
+    - #13370: Fix cart refresh after voucher removal
+    - #14075: Fix: If Ask for birth date option is disabled, an exception is displayed in the FO
+    - #13905: Step clickable and not - Checkout page
+    - #12891: Fix bug on block social in footer
+    - #13780: Fix displayed discount on tax excluded cart display
+
+- Core:
+  - Improvement:
+    - #14284: Update to Faceted search 3.0.5
+    - #13925: Add getter for current locale
+    - #14197: Update facetedsearch dependency
+    - #14010: Update some license headers that were outdated
+    - #14011: Update outdated CSS assets
+    - #13778: Add new hooks for Symfony migrated pages in XML install file and SQL upgrade
+  - Bug fix:
+    - #14324: Use Admin.Actions instead Admin.International.Help
+    - #14316: Reapply changes from PR switching on PHPSpreadsheet
+    - #14300: &= prevents result to be a boolean
+    - #13795: Updates to Domain
+    - #13919: Tax must be returned depending on PS_TAX_DISPLAY only
+    - #13923: Make sure index exist before getting value for gift message
+    - #14027: Fix BC break on Toggle column parameter
+    - #13885: Force array cache for doctrine
+    - #13808: Update Symfony to latest patch version to fix ICU version problem
+    - #13665: Final retail price is not displayed due to missing CLDR files
+
+- Installer:
+  - Bug fix:
+    - #14243: Fix translation catalogue
+    - #14225: Update facetedsearch cache
+
 ####################################
 #   v1.7.6.0-beta.1 - (2019-05-13)
 ####################################

src/Core/Localization/Specification/Factory.php

@@ -59,16 +59,18 @@ public function buildNumberSpecification(CldrLocaleInterface $cldrLocale, $maxFr
     {
         $decimalPattern = $cldrLocale->getDecimalPattern();
         $numbersSymbols = $cldrLocale->getAllNumberSymbols();
+        // Use positive pattern to retrieve information
+        $positivePattern = $this->getPositivePattern($decimalPattern);
 
         return new NumberSpecification(
-            $this->getPositivePattern($decimalPattern),
+            $positivePattern,
             $this->getNegativePattern($decimalPattern),
             $this->computeNumberSymbolLists($numbersSymbols),
             $maxFractionDigits,
-            $this->getMinFractionDigits($decimalPattern),
+            $this->getMinFractionDigits($positivePattern),
             $numberGroupingUsed,
-            $this->getPrimaryGroupSize($decimalPattern),
-            $this->getSecondaryGroupSize($decimalPattern)
+            $this->getPrimaryGroupSize($positivePattern),
+            $this->getSecondaryGroupSize($positivePattern)
         );
     }
 
@@ -102,16 +104,18 @@ public function buildPriceSpecification(
     ) {
         $currencyPattern = $cldrLocale->getCurrencyPattern();
         $numbersSymbols = $cldrLocale->getAllNumberSymbols();
+        // Use positive pattern to retrieve information
+        $positivePattern = $this->getPositivePattern($currencyPattern);
 
         return new PriceSpecification(
-            $this->getPositivePattern($currencyPattern),
+            $positivePattern,
             $this->getNegativePattern($currencyPattern),
             $this->computeNumberSymbolLists($numbersSymbols),
-            $this->getMaxFractionDigits($currencyPattern),
-            $this->getMinFractionDigits($currencyPattern),
-            $numberGroupingUsed && $this->getPrimaryGroupSize($currencyPattern) > 1,
-            $this->getPrimaryGroupSize($currencyPattern),
-            $this->getSecondaryGroupSize($currencyPattern),
+            $this->getMaxFractionDigits($positivePattern),
+            $this->getMinFractionDigits($positivePattern),
+            $numberGroupingUsed && $this->getPrimaryGroupSize($positivePattern) > 1,
+            $this->getPrimaryGroupSize($positivePattern),
+            $this->getSecondaryGroupSize($positivePattern),
             $currencyDisplayType,
             $currency->getSymbol($localeCode),
             $currency->getIsoCode()

src/PrestaShopBundle/Resources/views/Admin/Sell/Customer/Blocks/View/orders.html.twig

@@ -129,7 +129,7 @@
                   <td class="text-right">
                     <div class="btn-group-action">
                       <div class="btn-group">
-                        <a href=""
+                        <a href="{{ orderViewUrl }}"
                            class="btn tooltip-link dropdown-item"
                            data-toggle="pstooltip"
                            data-placement="top"

themes/classic/_dev/css/theme.scss

@@ -391,3 +391,12 @@
     padding-right: 0 !important;
   }
 }
+
+input[type=number] {
+  -moz-appearance:textfield;
+  &::-webkit-outer-spin-button,
+  &::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+}