fix: error then use old zip to update on local display up to date

PrestaShop · Oct 24, 2024 · 8fd5972 · 8fd5972
1 parent 7bab800
commit 8fd5972
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/classes/Upgrader.php b/classes/Upgrader.php
@@ -110,6 +110,19 @@ public function isLastVersion(): bool
         return version_compare($this->currentPsVersion, $this->getDestinationVersion(), '>=');
     }
 
+    /**
+     * @throws DistributionApiException
+     * @throws UpgradeException
+     */
+    public function isNewerVersionAvailableOnline(): bool
+    {
+        if ($this->getOnlineDestinationRelease() === null) {
+            return false;
+        }
+
+        return version_compare($this->currentPsVersion, $this->getOnlineDestinationRelease()->getVersion(), '<');
+    }
+
     /**
      * @throws DistributionApiException
      * @throws UpgradeException

diff --git a/controllers/admin/self-managed/UpdatePageVersionChoiceController.php b/controllers/admin/self-managed/UpdatePageVersionChoiceController.php
@@ -83,10 +83,10 @@ public function step(): string
     protected function getParams(): array
     {
         $updateSteps = new UpdateSteps($this->upgradeContainer->getTranslator());
-        $isLastVersion = $this->upgradeContainer->getUpgrader()->isLastVersion();
+        $isNewerVersionAvailableOnline = $this->upgradeContainer->getUpgrader()->isNewerVersionAvailableOnline();
         $onlineDestination = $this->upgradeContainer->getUpgrader()->getOnlineDestinationRelease();
 
-        if (!$isLastVersion) {
+        if ($isNewerVersionAvailableOnline) {
             $updateType = VersionUtils::getUpdateType($this->getPsVersion(), $onlineDestination->getVersion());
             $releaseNote = $this->upgradeContainer->getUpgrader()->getOnlineDestinationRelease()->getReleaseNoteUrl();
         } else {
@@ -115,7 +115,7 @@ protected function getParams(): array
         $params = array_merge(
             $updateSteps->getStepParams($this::CURRENT_STEP),
             [
-                'up_to_date' => $isLastVersion,
+                'up_to_date' => !$isNewerVersionAvailableOnline,
                 'no_local_archive' => !$this->upgradeContainer->getLocalArchiveRepository()->hasLocalArchive(),
                 'assets_base_path' => $this->upgradeContainer->getAssetsEnvironment()->getAssetsBaseUrl($this->request),
                 'current_prestashop_version' => $this->getPsVersion(),