fix: reposition draft fields

Author: KasparRosin

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.0.9] - 2022-11-21
+
+### Fixed
+
+- Fields defined after DraftButton were not saved to draft.
+
 ## [4.0.8] - 2022-11-21
 
 ### Fixed

src/Nova/Page.php

@@ -99,12 +99,6 @@ public function fields(Request $request)
             $fields[] = Text::make(__('novaPageManager.locale'), 'locale')->exceptOnForms();
         }
 
-        if (NovaPageManager::hasNovaDrafts()) {
-            $fields[] = \OptimistDigital\NovaDrafts\PublishedField::make(__('novaPageManager.status'), 'published');
-            $fields[] = \OptimistDigital\NovaDrafts\DraftButton::make(__('novaPageManager.draft'),'draft');
-            $fields[] = \OptimistDigital\NovaDrafts\UnpublishButton::make(__('novaPageManager.unpublish'),'unpublish');
-        }
-
         if (isset($templateClass) && $templateClass::$seo) $fields[] = new Panel(__('novaPageManager.seo'), $this->getSeoFields());
 
         if (!empty($templateFieldsAndPanels)) {
@@ -117,6 +111,11 @@ public function fields(Request $request)
             }
         }
 
+        if (NovaPageManager::hasNovaDrafts()) {
+            $fields[] = \OptimistDigital\NovaDrafts\PublishedField::make(__('novaPageManager.status'), 'published');
+            $fields[] = \OptimistDigital\NovaDrafts\DraftButton::make(__('novaPageManager.draft'),'draft');
+            $fields[] = \OptimistDigital\NovaDrafts\UnpublishButton::make(__('novaPageManager.unpublish'),'unpublish');
+        }
         return $fields;
     }