Should back to previous step without validation

ycs77 · Sep 8, 2024 · 71568ee · 71568ee
1 parent 0e7ccc2
commit 71568ee
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/Wizardable.php b/src/Wizardable.php
@@ -101,7 +101,16 @@ public function store(Request $request, string $step)
 
         $step = $this->getWizardStep($request, $step);
 
-        if ($step->skip() && $request->query('_trigger') === 'skip') {
+        // If trigger from 'back', set this step index and redirect to prev step.
+        if ($request->query('_trigger') === 'back' && $this->beforeBackWizardStep($request)) {
+            if ($this->wizard()->option('cache')) {
+                $step->cacheProgress($request);
+            }
+
+            $prevStep = $this->wizard()->stepRepo()->prev();
+
+            return $this->setThisStepAndRedirectTo($request, $prevStep);
+        } elseif ($step->skip() && $request->query('_trigger') === 'skip') {
             if ($this->wizard()->option('cache')) {
                 $step->cacheProgress($request);
             }
@@ -128,13 +137,6 @@ public function store(Request $request, string $step)
             if ($redirectTo = $this->wizardStepSaved($request, $step)) {
                 return $redirectTo;
             }
-
-            // If trigger from 'back', set this step index and redirect to prev step.
-            if ($request->query('_trigger') === 'back' && $this->beforeBackWizardStep($request)) {
-                $prevStep = $this->wizard()->stepRepo()->prev();
-
-                return $this->setThisStepAndRedirectTo($request, $prevStep);
-            }
         }
 
         if ($this->isLastStep()) {