From aabfd7ce7fd5e3294f7a4c26c7f0a46e93fa518c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”>
Date: Tue, 2 Apr 2024 09:46:09 +0200
Subject: [PATCH] CIM58 - Userflow - extended

---
 account.php                               | 5 ++++-
 equipments.php                            | 8 +++++++-
 partner.php                               | 5 ++++-
 settings/translations/translations_NL.php | 1 +
 settings/translations/translations_US.php | 1 +
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/account.php b/account.php
index 49ad5ae..b037b63 100644
--- a/account.php
+++ b/account.php
@@ -10,7 +10,10 @@ if (debug && debug_id == $_SESSION['id']){
 include_once './assets/functions.php';
 include_once './settings/settings.php';
 
-$page = 'account';
+//SET ORIGIN FOR NAVIGATION
+$_SESSION['prev_origin'] = $_SERVER['REQUEST_URI'];
+$page = $_SESSION['origin'] = 'account';
+
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
     header('location: index.php');
diff --git a/equipments.php b/equipments.php
index 0fb0fcc..107575f 100644
--- a/equipments.php
+++ b/equipments.php
@@ -10,8 +10,12 @@ include_once './assets/functions.php';
 include_once './settings/settings.php';
 
 //SET PAGE ORIGIN FOR NAVIGATION AND SECURITY
+$prev_page = $_SESSION['prev_origin'] ?? '';
 $page = $_SESSION['origin'] = 'equipments';
 
+//create backbutton to prev_origin
+$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
+
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
     header('location: index.php');
@@ -34,7 +38,6 @@ $warrantydate = $_SESSION['warrantydate'] = isset($_GET['warrantydate']) ? '&war
 $partnerid = $_SESSION['partnerid'] = isset($_GET['partnerid']) ? '&partnerid='.$_GET['partnerid'] : '';
 
 
-
 //GET PARAMETERS FOR FILTERS
 $filter = urlGETdetailsFilter($_GET) ?? '';
 
@@ -71,6 +74,9 @@ if (isset($_GET['download'])){
     downloadToExcel('equipment',$responses);
 }
 
+
+
+
 template_header('Assets', 'assets','view');
 $view = '
 <div class="content-title">
diff --git a/partner.php b/partner.php
index 33b1aab..0b3dfa5 100644
--- a/partner.php
+++ b/partner.php
@@ -1,7 +1,10 @@
 <?php
 defined(page_security_key) or exit;
 
-$page = 'partner';
+//SET ORIGIN FOR NAVIGATION
+$_SESSION['prev_origin'] = $_SERVER['REQUEST_URI'];
+$page = $_SESSION['origin'] ='partner';
+
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
     header('location: index.php');
diff --git a/settings/translations/translations_NL.php b/settings/translations/translations_NL.php
index 500ad92..7a99edd 100644
--- a/settings/translations/translations_NL.php
+++ b/settings/translations/translations_NL.php
@@ -60,6 +60,7 @@ $general_logout = 'Uitloggen';
 
 $button_apply = 'Toepassen';
 $button_cancel = 'Terug';
+$button_back = 'Terug';
 $button_history = 'Geschiedenis';
 $button_firmware = 'Update software';
 $button_create_asset = 'Maak activa';
diff --git a/settings/translations/translations_US.php b/settings/translations/translations_US.php
index c21fe5a..33733e3 100644
--- a/settings/translations/translations_US.php
+++ b/settings/translations/translations_US.php
@@ -60,6 +60,7 @@ $general_logout = 'Logout';
 
 $button_apply = 'Apply';
 $button_cancel = 'Cancel';
+$button_back = 'Back';
 $button_history = 'History';
 $button_firmware = 'Update firmware';
 $button_create_asset = 'Create asset';