Merge pull request PrestaShop#21096 from sowbiba/merge177xintodevelop

Merge 177x into develop 22/09/2020
Leoche · Sep 24, 2020 · 1a54871 · 1a54871
2 parents 4ea9db8 + 73b22be
commit 1a54871
Show file tree

Hide file tree

Showing 58 changed files with 1,605 additions and 174 deletions.
diff --git a/admin-dev/themes/default/sass/partials/_nav.sass b/admin-dev/themes/default/sass/partials/_nav.sass
@@ -44,7 +44,6 @@
 		&.expanded
 			display: block
 			margin-left: 0
-			overflow-y: scroll
 
 		.onboarding-navbar
 			display: none
@@ -345,7 +344,7 @@
 		padding-right: .8rem
 
 	.nav-bar
-		overflow: visible!important;
+		overflow: visible !important
 		width: $size-navbar-width-mini
 
 		&-overflow

diff --git a/...n-dev/themes/new-theme/scss/img/glyph.png → admin-dev/themes/new-theme/img/glyph.png b/...n-dev/themes/new-theme/scss/img/glyph.png → admin-dev/themes/new-theme/img/glyph.png
diff --git a/admin-dev/themes/new-theme/scss/components/layout/_nav_bar.scss b/admin-dev/themes/new-theme/scss/components/layout/_nav_bar.scss
@@ -51,7 +51,6 @@
     &.expanded {
       display: block;
       margin-left: 0;
-      overflow-y: scroll;
     }
     .onboarding-navbar {
       display: none;

diff --git a/classes/Tools.php b/classes/Tools.php
@@ -49,6 +49,7 @@ class ToolsCore
     protected static $request;
     protected static $cldr_cache = [];
     protected static $colorBrightnessCalculator;
+    protected static $fallbackParameters = [];
 
     public static $round_mode = null;
 
@@ -524,8 +525,14 @@ public static function getValue($key, $default_value = false)
 
         if (getenv('kernel.environment') === 'test' && self::$request instanceof Request) {
             $value = self::$request->request->get($key, self::$request->query->get($key, $default_value));
-        } else {
-            $value = (isset($_POST[$key]) ? $_POST[$key] : (isset($_GET[$key]) ? $_GET[$key] : $default_value));
+        } elseif (isset($_POST[$key]) || isset($_GET[$key])) {
+            $value = isset($_POST[$key]) ? $_POST[$key] : $_GET[$key];
+        } elseif (isset(static::$fallbackParameters[$key])) {
+            $value = static::$fallbackParameters[$key];
+        }
+
+        if (!isset($value)) {
+            $value = $default_value;
         }
 
         if (is_string($value)) {
@@ -4439,6 +4446,14 @@ public static function redirectToInstall()
         }
         exit;
     }
+
+    /**
+     * @param array $fallbackParameters
+     */
+    public static function setFallbackParameters(array $fallbackParameters): void
+    {
+        static::$fallbackParameters = $fallbackParameters;
+    }
 }
 
 /**

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
@@ -2664,7 +2664,7 @@ public function setMedia($isNewTheme = false)
             $this->addJs(_PS_JS_DIR_ . 'jquery/jquery-migrate-3.1.0.min.js');
             // implement $.browser object and live method, that has been removed since jquery 1.9
             $this->addJs(_PS_JS_DIR_ . 'jquery/jquery.browser-0.1.0.min.js');
-            $this->addJs(_PS_JS_DIR_ . 'jquery/jquery.live-polyfill-1.1.1.min.js');
+            $this->addJs(_PS_JS_DIR_ . 'jquery/jquery.live-polyfill-1.1.2.min.js');
 
             $this->addJqueryPlugin(['scrollTo', 'alerts', 'chosen', 'autosize', 'fancybox']);
             $this->addJqueryPlugin('growl', null, false);

diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php
@@ -506,7 +506,7 @@ public function postProcess()
                 // Delete from the reference_id and not from the carrier id
                 $carrier = new Carrier((int) $id);
                 Warehouse::removeCarrier($carrier->id_reference);
-            } elseif (Tools::isSubmit($this->table . 'Box') && count(Tools::isSubmit($this->table . 'Box')) > 0) {
+            } elseif (Tools::isSubmit($this->table . 'Box') && count(Tools::getValue($this->table . 'Box', [])) > 0) {
                 $ids = Tools::getValue($this->table . 'Box');
                 array_walk($ids, 'intval');
                 foreach ($ids as $id) {

diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php
@@ -460,7 +460,7 @@ public function initContent()
     public function initProcess()
     {
         // Are we working on feature values?
-        if (Tools::getValue('id_feature_value')
+        if ((Tools::getValue('id_feature_value') && !Tools::getValue('id_feature'))
             || Tools::isSubmit('deletefeature_value')
             || Tools::isSubmit('submitAddfeature_value')
             || Tools::isSubmit('addfeature_value')

diff --git a/install-dev/fixtures/fashion/data/store.xml b/install-dev/fixtures/fashion/data/store.xml
@@ -18,7 +18,7 @@
     <field name="active"/>
   </fields>
   <entities>
-    <store id="Dade_County" id_country="US" id_state="FL" postcode=" 33135" latitude="25.76500500" longitude="-80.24379700" phone="" fax="" active="1">
+    <store id="Dade_County" id_country="US" id_state="FL" postcode="33135" latitude="25.76500500" longitude="-80.24379700" phone="" fax="" active="1">
       <name>Dade County</name>
       <address1>3030 SW 8th St Miami</address1>
       <address2/>
@@ -27,7 +27,7 @@
       <email/>
       <note/>
     </store>
-    <store id="E_Fort_Lauderdale" id_country="US" id_state="FL" postcode=" 33304" latitude="26.13793600" longitude="-80.13943500" phone="" fax="" active="1">
+    <store id="E_Fort_Lauderdale" id_country="US" id_state="FL" postcode="33304" latitude="26.13793600" longitude="-80.13943500" phone="" fax="" active="1">
       <name>E Fort Lauderdale</name>
       <address1>1000 Northeast 4th Ave Fort Lauderdale</address1>
       <address2/>
@@ -45,7 +45,7 @@
       <email/>
       <note/>
     </store>
-    <store id="Coconut_Grove" id_country="US" id_state="FL" postcode=" 33133" latitude="25.73629600" longitude="-80.24479700" phone="" fax="" active="1">
+    <store id="Coconut_Grove" id_country="US" id_state="FL" postcode="33133" latitude="25.73629600" longitude="-80.24479700" phone="" fax="" active="1">
       <name>Coconut Grove</name>
       <address1>2999 SW 32nd Avenue</address1>
       <address2/>

diff --git a/js/admin/carrier_wizard.js b/js/admin/carrier_wizard.js
@@ -187,7 +187,7 @@ function displaySummary()
 
 	// Delay and pricing
 	tmp = summary_translation_meta_informations.replace('%2$s', '<strong>' + delay_text + '</strong>');
-	if ($('#is_free_on').attr('checked'))
+	if ($('#is_free_on').prop('checked'))
 		tmp = tmp.replace('%1$s', summary_translation_free);
 	else
 		tmp = tmp.replace('%1$s', summary_translation_paid);
@@ -196,9 +196,9 @@ function displaySummary()
 	// Tax and calculation mode for the shipping cost
 	tmp = summary_translation_shipping_cost.replace('%2$s', $('#id_tax_rules_group option:selected').text());
 
-		if ($('#billing_price').attr('checked'))
+		if ($('#billing_price').prop('checked'))
 			tmp = tmp.replace('%1$s', summary_translation_price);
-		else if ($('#billing_weight').attr('checked'))
+		else if ($('#billing_weight').prop('checked'))
 			tmp = tmp.replace('%1$s', summary_translation_weight);
 		else
 			tmp = tmp.replace('%1$s', '<strong>' + summary_translation_undefined + '</strong>');
@@ -237,26 +237,26 @@ function displaySummary()
 		.replace('%2$s', '<strong>' + range_sup +' '+ unit + '</strong>')
 		.replace('%3$s', '<strong>' + $('#range_behavior option:selected').text().toLowerCase() + '</strong>')
 	);
-	if ($('#is_free_on').attr('checked'))
+	if ($('#is_free_on').prop('checked'))
 		$('span.is_free').hide();
 	// Delivery zones
 	$('#summary_zones').html('');
 	$('.input_zone').each(function(){
-		if ($(this).attr('checked'))
+		if ($(this).prop('checked'))
 			$('#summary_zones').html($('#summary_zones').html() + '<li><strong>' + $(this).closest('tr').find('label').text() + '</strong></li>');
 	});
 
 	// Group restrictions
 	$('#summary_groups').html('');
 	$('input[name$="groupBox[]"]').each(function(){
-		if ($(this).attr('checked'))
+		if ($(this).prop('checked'))
 			$('#summary_groups').html($('#summary_groups').html() + '<li><strong>' + $(this).closest('tr').find('td:eq(2)').text() + '</strong></li>');
 	});
 
 	// shop restrictions
 	$('#summary_shops').html('');
 	$('.input_shop').each(function(){
-		if ($(this).attr('checked'))
+		if ($(this).prop('checked'))
 			$('#summary_shops').html($('#summary_shops').html() + '<li><strong>' + $(this).closest().text() + '</strong></li>');
 	});
 }
@@ -266,7 +266,7 @@ function validateSteps(fromStep, toStep)
 	var is_ok = true;
 	if ((multistore_enable && fromStep == 3) || (!multistore_enable && fromStep == 2))
 	{
-		if (toStep > fromStep && !$('#is_free_on').attr('checked'))
+		if (toStep > fromStep && !$('#is_free_on').prop('checked'))
 		{
 			is_ok = false;
 			$('.input_zone').each(function () {
@@ -281,7 +281,7 @@ function validateSteps(fromStep, toStep)
 			}
 		}
 
-		if (toStep > fromStep && !$('#is_free_on').attr('checked') && !validateRange(2))
+		if (toStep > fromStep && !$('#is_free_on').prop('checked') && !validateRange(2))
 			is_ok = false;
 	}
 
@@ -370,14 +370,14 @@ function bind_inputs()
 				if ($('tr.fees_all td:eq('+index+')').hasClass('validated'))
 				{
 					enableGlobalFees(index);
-					$(this).find('div.input-group input:text').removeAttr('disabled');
+					$(this).find('div.input-group input:text').prop('disabled', false);
 				}
 				else
 					disabledGlobalFees(index);
 			});
 		}
 		else
-			$(this).closest('tr').find('td').find('div.input-group input:text').attr('disabled', 'disabled');
+			$(this).closest('tr').find('td').find('div.input-group input:text').prop('disabled', true);
 
 		return false;
 	});
@@ -401,7 +401,7 @@ function bind_inputs()
 	});
 
 	$(document.body).off('change', 'tr.fees_all td input').on('change', 'tr.fees_all td input', function() {
-	   index = $(this).closest('td').index();
+	  index = $(this).closest('td').index();
 		val = $(this).val();
 		$(this).val('');
 		$('tr.fees').each(function () {
@@ -452,7 +452,7 @@ function hideFees()
 	$('tr.range_inf td, tr.range_sup td, tr.fees_all td, tr.fees td').each(function () {
 		if ($(this).index() >= 2)
 		{
-			$(this).find('input:text, button').val('').attr('disabled', 'disabled').css('background-color', '#999999').css('border-color', '#999999');
+			$(this).find('input:text, button').val('').prop('disabled', true).css('background-color', '#999999').css('border-color', '#999999');
 			$(this).css('background-color', '#999999');
 		}
 	});
@@ -467,10 +467,10 @@ function showFees()
 			//enable only if zone is active
 			tr = $(this).closest('tr');
 			validate = $('tr.fees_all td:eq('+$(this).index()+')').hasClass('validated');
-			if ($(tr).index() > 2 && $(tr).find('td:eq(1) input').attr('checked') && validate || !$(tr).hasClass('range_sup') || !$(tr).hasClass('range_inf'))
-				$(this).find('div.input-group input:text').removeAttr('disabled');
+			if ($(tr).index() > 2 && $(tr).find('td:eq(1) input').prop('checked') && validate || !$(tr).hasClass('range_sup') || !$(tr).hasClass('range_inf'))
+				$(this).find('div.input-group input:text').prop('disabled', false);
 			$(this).find('input:text, button').css('background-color', '').css('border-color', '');
-			$(this).find('button').css('background-color', '').css('border-color', '').removeAttr('disabled');
+			$(this).find('button').css('background-color', '').css('border-color', '').prop('disabled', false);
 			$(this).css('background-color', '');
 		}
 	});
@@ -486,7 +486,7 @@ function validateRange(index)
 	var $currentRangeInf = $('tr.range_inf td:eq(' + index + ')').find('div.input-group input:text');
 	var rangeSup = parseFloat($currentRangeSup.val().trim());
 	var rangeInf = parseFloat($currentRangeInf.val().trim());
-	
+
 	//reset css error
 	$currentRangeSup.closest('div.input-group').removeClass('has-error');
 	$currentRangeInf.closest('div.input-group').removeClass('has-error');
@@ -536,22 +536,22 @@ function enableZone(index)
 {
 	$('tr.fees').each(function () {
 		if ($(this).find('td:eq(1)').find('input[type=checkbox]:checked').length)
-			$(this).find('td:eq('+index+')').find('div.input-group input').removeAttr('disabled');
+			$(this).find('td:eq('+index+')').find('div.input-group input').prop('disabled', false);
 	});
 }
 
 function disableZone(index)
 {
 	$('tr.fees').each(function () {
-		$(this).find('td:eq('+index+')').find('div.input-group input').attr('disabled', 'disabled');
+		$(this).find('td:eq('+index+')').find('div.input-group input').prop('disabled', true);
 	});
 }
 
 function enableRange(index)
 {
 	$('tr.fees').each(function () {
 		//only enable fees for enabled zones
-		if ($(this).find('td').find('input:checkbox').attr('checked') == 'checked')
+		if ($(this).find('td').find('input:checkbox').prop('checked'))
 			enableZone(index);
 	});
 	$('tr.fees_all td:eq('+index+')').addClass('validated').removeClass('not_validated');
@@ -564,14 +564,14 @@ function enableRange(index)
 function enableGlobalFees(index)
 {
 	$('span.fees_all').show();
-	$('tr.fees_all td:eq('+index+')').find('div.input-group input').show().removeAttr('disabled');
+	$('tr.fees_all td:eq('+index+')').find('div.input-group input').show().prop('disabled', false);
 	$('tr.fees_all td:eq('+index+')').find('div.input-group .currency_sign').show();
 }
 
 function disabledGlobalFees(index)
 {
 	$('span.fees_all').hide();
-	$('tr.fees_all td:eq('+index+')').find('div.input-group input').hide().attr('disabled', 'disabled');
+	$('tr.fees_all td:eq('+index+')').find('div.input-group input').hide().prop('disabled', true);
 	$('tr.fees_all td:eq('+index+')').find('div.input-group .currency_sign').hide();
 }
 
@@ -580,10 +580,10 @@ function disableRange(index)
 {
 	$('tr.fees').each(function () {
 		//only enable fees for enabled zones
-		if ($(this).find('td').find('input:checkbox').attr('checked') == 'checked')
+		if ($(this).find('td').find('input:checkbox').prop('checked'))
 			disableZone(index);
 	});
-	$('tr.fees_all td:eq('+index+')').find('div.input-group input').attr('disabled', 'disabled');
+	$('tr.fees_all td:eq('+index+')').find('div.input-group input').prop('disabled', true);
 	$('tr.fees_all td:eq('+index+')').removeClass('validated').addClass('not_validated');
 }
 
@@ -742,21 +742,21 @@ function checkAllZones(elt)
 {
 	if($(elt).is(':checked'))
 	{
-		$('.input_zone').attr('checked', 'checked');
+		$('.input_zone').prop('checked', true);
 		$('.fees div.input-group input:text').each(function () {
 			index = $(this).closest('td').index();
 			enableGlobalFees(index);
 			if ($('tr.fees_all td:eq('+index+')').hasClass('validated'))
 			{
-				$(this).removeAttr('disabled');
-				$('.fees_all td:eq('+index+') div.input-group input:text').removeAttr('disabled');
+				$(this).prop('disabled', false);
+				$('.fees_all td:eq('+index+') div.input-group input:text').prop('disabled', false);
 			}
 		});
 	}
 	else
 	{
-		$('.input_zone').removeAttr('checked');
-		$('.fees div.input-group input:text, .fees_all div.input-group input:text').attr('disabled', 'disabled');
+		$('.input_zone').prop('checked', false);
+		$('.fees div.input-group input:text, .fees_all div.input-group input:text').prop('disabled', true);
 	}
 
 }
@@ -789,7 +789,7 @@ var carriersRangeInputs = {
 			$this.off();
 			var index = $this.closest('td').index();
 			var hasError = $('tr.range_sup td:eq(' + index + ') .has-error, tr.range_inf td:eq(' + index + ') .has-error');
-			
+
 			if ($('.wizard_error').length === 0 || hasError.length !== 0) {
 				carriersRangeInputs.checkCarriersRangeValidation(index);
 			}

diff --git a/js/jquery/jquery.live-polyfill-1.1.1.min.js b/js/jquery/jquery.live-polyfill-1.1.1.min.js
diff --git a/js/jquery/jquery.live-polyfill-1.1.2.min.js b/js/jquery/jquery.live-polyfill-1.1.2.min.js
@@ -0,0 +1,6 @@
+/*!
+ * https://github.com/PrestaShop/jquery.live-polyfill
+ *
+ * Released under the MIT license
+ */
+!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e(require("jquery")):e(jQuery)}(function(e){var n=e.fn.init;e.fn.init=function(e){var t=Array.prototype.slice.call(arguments);"string"==typeof e&&"#"===e&&(console.warn("jQuery('#') is not a valid selector"),t[0]=[]);var i=n.apply(this,arguments);return i.selector="string"==typeof e?e:"",i},e.fn.init.prototype=e.fn,void 0!==e.fn.live&&e.isFunction(e.fn.live)||e.fn.extend({live:function(n,t,i){return this.selector&&e(document).on(n,this.selector,t,i),console.warn("jQuery.live() has been removed since jquery v1.9, please use jQuery.on() instead."),this}})});
diff --git a/src/Adapter/Order/CommandHandler/UpdateProductInOrderHandler.php b/src/Adapter/Order/CommandHandler/UpdateProductInOrderHandler.php
@@ -38,6 +38,7 @@
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
 use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\CannotEditDeliveredOrderProductException;
+use PrestaShop\PrestaShop\Core\Domain\Order\Exception\CannotFindProductInOrderException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\DuplicateProductInOrderInvoiceException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\UpdateProductInOrderCommand;
@@ -151,6 +152,12 @@ private function assertProductCanBeUpdated(
         Order $order,
         OrderInvoice $orderInvoice = null
     ) {
+        // assert product exists
+        $product = new Product($orderDetail->product_id);
+        if ($product->id !== (int) $orderDetail->product_id) {
+            throw new CannotFindProductInOrderException('You cannot edit the price of a product that no longer exists in your catalog.');
+        }
+
         if (!Validate::isLoadedObject($orderDetail)) {
             throw new OrderException('The Order Detail object could not be loaded.');
         }