fix:[#3337] Fix login in ordering

Fix redirect to login when
user is trying to order a service

Closes #3337

CHANGELOG.md

@@ -10,19 +10,43 @@ Please view this file on the master branch, on stable branches it's out of date.
 ## [3.58.0]
 
 ### Added
+- Environmental variable to hide recommendation panel (`SHOW_RECOMMENDATION_PANEL`) (@maria-j-k)
+- Unit to the constant offer parameter (@gorreck888)
 - Add save as draft feature to offers form (@maria-j-k, @jarekzet)
 
 ### Changed
+- MarketplaceLocation renamed to ResearchActivity (@maria-j-k)
+- Remove suggested services (@maria-j-k)
+- Unlock unpublish/suspend and delete actions for active providers and catalogues (@goreck888)
+- New backoffice view (@jarekzet, goreck888)
+- Organisation name on service detail and list view links to provider detail page (@maria-j-k)
+- Other settings tab should be visible only for users with service portfolio manager role (@maria-j-k)
+- Logo in catalogues, services, providers is not required. Set default logo for each (@maria-j-k)
+- Status bar with actions buttons in detail and edit views for services, catalogues and providers (@maria-j-k)
+- Postgres update from 14.1 to 16.4 (@goreck888)
 
 ### Fixed
+- Number of requests handling data_administrators scope (@goreck888)
+- Show pop-up on add to favourites (@maria-j-k)
+- Pre-fill administrator data in catalogues creation form (@maria-j-k)
+- Bundle status changes to draft if any of its offers changes the status from public to other (@maria-j-k)
+- Fix access_type validator in offer (@maria-j-k)
+- Compare/Favourite icons on the service page (@jarekzet)
+- Back to previous button fixed (@maria-j-k)
+- Removed `no_offers` message in deleted services (@goreck888)
+- Redirect to login when unlogged user is ordering a service(@goreck888)
 - Remove old EOSC logo (@maria-j-k)
 
 ### Security
 - Update dependencies (@goreck888)
 
-
 ## [3.57.0]
 
+### Added
+- Handling data administrator scope in the backoffice (@goreck888)
+- Statuses changes for providers and catalogues (@goreck888)
+- Delete button for services (@goreck888)
+
 ### Changed
 - New design for bundles (@jarekzet, @goreck888)
 - Add Exit button to offers form (@maria-j-k)

app/helpers/order_nav_helper.rb

@@ -11,12 +11,7 @@ def order_nav_link(title, path, state)
         "data-probe": "",
         onclick:
           if state == :next
-            "
-                      const form = document.getElementById('order-form');
-                      if (typeof(form) != 'undefined' && form != null) {
-                        form.submit();
-                      }
-                    "
+            go_to_next_step
           else
             ""
           end
@@ -35,4 +30,13 @@ def order_nav_link(title, path, state)
       end
     end
   end
+
+  def go_to_next_step
+    "
+                      const form = document.getElementById('order-form');
+                      if (typeof(form) != 'undefined' && form != null) {
+                        form.submit();
+                      }
+                    "
+  end
 end

app/views/layouts/order.html.haml

@@ -15,8 +15,7 @@
                                                           "service-id": @service.id,
                                                           "turbo-method": :delete }
           .ml-3.d-inline
-            %button.btn.btn-primary{ form: "order-form", type: "submit",
-                                     data: { probe: "summary", turbo: false } }= next_title
+            %button.btn.btn-primary{ form: "order-form", onclick: go_to_next_step }= next_title
       #flash-messages.flash
         = render "layouts/flash"
       = turbo_frame_tag "modal"
@@ -29,8 +28,7 @@
           = link_to prev_title, url_for([@service, prev_visible_step_key]),
           class: "text-uppercase", "data-probe": "" if prev_visible_step_key
         .ml-3.d-inline
-          %button.btn.btn-primary{ form: "order-form", type: "submit",
-            "data-probe": "summary", "data-service-id": @service.id, "data-turbo": false }= next_title
+          %button.btn.btn-primary{ form: "order-form", onclick: go_to_next_step }= next_title
 
   = render "layouts/eosc_commons_footer"
   = render "layouts/recommendation"