No software versions available at this time.
';
- }
-
- } catch (error) {
- container.innerHTML = `
';
+$view .= '
+
+
+';
+
$view .= '
diff --git a/products_software_assignments.php b/products_software_assignments.php
new file mode 100644
index 0000000..5904720
--- /dev/null
+++ b/products_software_assignments.php
@@ -0,0 +1,171 @@
+ 0) {
+ $product = $product[0];
+ } else {
+ $product = null;
+ }
+} else {
+ $product = null;
+}
+
+// Get assigned software versions
+$api_url = '/v2/products_software_assignment/product_id='.$productrowid;
+$assigned_response = ioServer($api_url,'');
+if (!empty($assigned_response)){$assigned = json_decode($assigned_response,true);}else{$assigned = [];}
+$assigned_ids = array_column($assigned, 'software_version_id');
+
+// Get all software versions
+$api_url = '/v2/products_software_versions/list';
+$versions_response = ioServer($api_url,'');
+if (!empty($versions_response)){$versions = json_decode($versions_response,true);}else{$versions = [];}
+
+// Get all upgrade paths
+$api_url = '/v2/products_software_upgrade_paths/list';
+$paths_response = ioServer($api_url,'');
+if (!empty($paths_response)){$paths = json_decode($paths_response,true);}else{$paths = [];}
+
+// Handle form submission
+if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['submit'])) {
+ $selected_versions = $_POST['versions'] ?? [];
+
+ // Delete existing assignments not in selected
+ foreach ($assigned as $assign) {
+ if (!in_array($assign['software_version_id'], $selected_versions)) {
+ $payload = json_encode(['rowID' => $assign['rowID'], 'delete' => true], JSON_UNESCAPED_UNICODE);
+ ioServer('/v2/products_software_assignment', $payload);
+ }
+ }
+
+ // Add new assignments
+ foreach ($selected_versions as $version_id) {
+ if (!in_array($version_id, $assigned_ids)) {
+ $payload = json_encode(['product_id' => $productrowid, 'software_version_id' => $version_id], JSON_UNESCAPED_UNICODE);
+ ioServer('/v2/products_software_assignment', $payload);
+ }
+ }
+
+ header('Location: index.php?page=products_software_assignments&productrowid='.$productrowid.'&success_msg=1');
+ exit;
+}
+
+// Handle success messages
+if (isset($_GET['success_msg'])) {
+ if ($_GET['success_msg'] == 1) {
+ $success_msg = 'Software assignments updated successfully.';
+ }
+}
+
+template_header('Software Assignments', 'products_software_assignments', 'manage');
+
+$view = '
+
+
Software Assignments for ' . ($product ? (($product->productcode ?? 'Unknown') . ' - ' . (${$product->productname} ?? $product->productname)) : 'Product not found') . '
+
back
+
+';
+
+if (isset($success_msg)){
+ $view .= '
';
+}
+
+$view .= '
+
+';
+
+$view .= '
+
+';
+
+//OUTPUT
+echo $view;
+
+template_footer();
+?>
\ No newline at end of file
diff --git a/products_software_upgrade_paths_manage.php b/products_software_upgrade_paths_manage.php
new file mode 100644
index 0000000..88acf7a
--- /dev/null
+++ b/products_software_upgrade_paths_manage.php
@@ -0,0 +1,216 @@
+ '',
+ 'from_version_id' => '',
+ 'to_version_id' => '',
+ 'price' => '',
+ 'currency' => 'USD',
+ 'description' => '',
+ 'is_active' => 1,
+ 'created' => '',
+ 'createdby' => $_SESSION['username'],
+ 'updated' => '',
+ 'updatedby' => $_SESSION['username']
+];
+
+// Determine filter version id from URL (for hw_version filtering)
+$filter_version_id = $_GET['from_version_id'] ?? $_GET['to_version_id'] ?? $_GET['id'] ?? '';
+
+// If editing, fetch existing data
+if (isset($_GET['id']) && $_GET['id'] != '') {
+ $api_url = '/v2/products_software_upgrade_paths/rowID=' . $_GET['id'];
+ $response = ioServer($api_url, '');
+ var_dump($response);
+ if (!empty($response)) {
+ $existing = json_decode($response);
+ if (!empty($existing)) {
+ $path = (array) $existing[0];
+ }
+ }
+}
+
+// Fetch software versions for selects
+$api_url = '/v2/products_software_versions/list';
+$versions_response = ioServer($api_url, '');
+$all_versions = [];
+if (!empty($versions_response)) {
+ $all_versions = json_decode($versions_response);
+}
+
+// Determine hw_version for filtering
+$filter_hw_version = null;
+$selected_versions = [];
+
+if (!empty($path['from_version_id'])) {
+ $selected_versions[] = $path['from_version_id'];
+ $api_url = '/v2/products_software_versions/rowID=' . $path['from_version_id'];
+ $response = ioServer($api_url, '');
+ if (!empty($response)) {
+ $ver = json_decode($response);
+ if (!empty($ver)) {
+ $filter_hw_version = $ver[0]->hw_version;
+ }
+ }
+}
+if (!empty($path['to_version_id'])) {
+ $selected_versions[] = $path['to_version_id'];
+}
+
+if ($filter_hw_version === null && !empty($filter_version_id)) {
+ $api_url = '/v2/products_software_versions/rowID=' . $filter_version_id;
+ $response = ioServer($api_url, '');
+ if (!empty($response)) {
+ $ver = json_decode($response);
+ if (!empty($ver)) {
+ $filter_hw_version = $ver[0]->hw_version;
+ }
+ }
+}
+
+// Filter versions to same hw_version
+$versions = [];
+if ($filter_hw_version !== null) {
+ foreach ($all_versions as $ver) {
+ if ($ver->hw_version == $filter_hw_version) {
+ $versions[] = $ver;
+ }
+ }
+ // Ensure selected versions are included
+ foreach ($selected_versions as $sel_id) {
+ $found = false;
+ foreach ($versions as $ver) {
+ if ($ver->rowID == $sel_id) {
+ $found = true;
+ break;
+ }
+ }
+ if (!$found) {
+ // Fetch and add
+ $api_url = '/v2/products_software_versions/rowID=' . $sel_id;
+ $response = ioServer($api_url, '');
+ if (!empty($response)) {
+ $ver = json_decode($response);
+ if (!empty($ver)) {
+ $versions[] = $ver[0];
+ }
+ }
+ }
+ }
+} else {
+ $versions = $all_versions;
+}
+
+// Handle form submission
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ $data = [
+ 'rowID' => $_POST['rowID'] ?? '',
+ 'from_version_id' => $_POST['from_version_id'] ?? '',
+ 'to_version_id' => $_POST['to_version_id'] ?? '',
+ 'price' => $_POST['price'] ?? '',
+ 'currency' => $_POST['currency'] ?? 'USD',
+ 'description' => $_POST['description'] ?? '',
+ 'is_active' => isset($_POST['is_active']) ? 1 : 0
+ ];
+
+ // Handle delete
+ if (isset($_POST['delete'])) {
+ $data['delete'] = true;
+ }
+
+ // Call API
+ $api_url = '/v2/products_software_upgrade_paths/';
+ $result = ioServer($api_url, json_encode($data));
+
+ if ($result) {
+ $success = isset($_POST['delete']) ? 3 : (isset($_POST['rowID']) && $_POST['rowID'] != '' ? 2 : 1);
+ header('Location: ' . $url . '&success_msg=' . $success);
+ exit;
+ } else {
+ $error_msg = 'Failed to save upgrade path.';
+ }
+}
+
+template_header('Upgrade Path', 'products_software_upgrade_paths_manage', 'manage');
+
+$view ='
+
';
+
+if (isset($success_msg)){
+$view .= '
';
+}
+$view .= '
+
+';
+
+$view .= '
+
+
+
+
+
+ | Name |
+ Version |
+ HW Version |
+ Mandatory |
+ Latest |
+ Status |
+ Actions |
+
+
+
+ ';
+
+ if (empty($responses)){
+
+ $view .= '
+
+ | '.$message_no_software_versions.' |
+
';
+ }
+ else {
+ foreach ($responses as $response){
+
+ $view .= '
+
+ | '.$response->name.' |
+ '.$response->version.' |
+ '.$response->hw_version.' |
+ '.($response->mandatory ? 'Yes' : 'No').' |
+ '.($response->latest ? 'Yes' : 'No').' |
+ '.($response->status ? 'Active' : 'Inactive').' |
+ View |
+
+ ';
+ }
+ }
+$view .= '
+
+
+
+
+';
+
+$view.='';
+//OUTPUT
+echo $view;
+
+template_footer();
+?>
\ No newline at end of file
diff --git a/settings/settingsmenu.php b/settings/settingsmenu.php
index cb3760b..d90a788 100644
--- a/settings/settingsmenu.php
+++ b/settings/settingsmenu.php
@@ -142,6 +142,12 @@ $main_menu = [
"selected" => "products",
"icon" => "fas fa-box-open",
"name" => "menu_products"
+ ],
+ "products_software" => [
+ "url" => "products_software_versions",
+ "selected" => "products_software_versions",
+ "icon" => "fas fa-box-open",
+ "name" => "menu_products_software_versions"
],
"products_attributes" => [
"url" => "products_attributes",
@@ -281,14 +287,6 @@ $main_menu = [
"icon" => "fas fa-tachometer-alt",
"name" => "menu_profiles"
]
- ],
- "upgrades" => [
- "main_menu" => [
- "url" => "upgrades",
- "selected" => "upgrades",
- "icon" => "fas fa-download",
- "name" => "menu_upgrades"
- ]
]
];
@@ -324,6 +322,8 @@ $page_rows_shipping = 25;//discounts
$page_rows_transactions = 25; //transactions
$page_rows_invoice = 25; //invoices
$page_rows_dealers = 25; //dealers
+$page_rows_software_versions = 50; //software versions
+$page_rows_software_assignment = 50; //software assignment
//------------------------------------------
// Languages supported
diff --git a/settings/settingsprofiles.php b/settings/settingsprofiles.php
index 33a6519..5a5768a 100644
--- a/settings/settingsprofiles.php
+++ b/settings/settingsprofiles.php
@@ -6,7 +6,7 @@ define('superuser_profile','dashboard,profile,assets,equipments,equipment,equipm
/*Admin*/
define('admin_profile','dashboard,profile,buildtool,sales,accounts,account,contracts,contract,contract_manage,cartests,cartest,cartest_manage,assets,equipments,equipment,equipment_healthindex,equipment_data,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,rmas,rma,rma_manage,rma_history,rma_history_manage,buildtool,products,products_versions,products_software,product,product_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,communications,communication,communication_send,marketing,reporting,report_build,report_contracts_billing,report_healthindex,changelog,application');
/*AdminPlus*/
-define('adminplus_profile','dashboard,profile,buildtool,sales,accounts,account,contracts,contract,contract_manage,billing,cartests,cartest,cartest_manage,dealers,dealers_media,dealer,dealer_manage,assets,equipments,equipment,equipment_healthindex,equipment_data,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,rmas,rma,rma_manage,rma_history,rma_history_manage,buildtool,products,products_versions,products_software,products_attributes,products_attributes_items,products_attributes_manage,products_configurations,products_categories,products_media,product,product_manage,pricelists,pricelists_items,pricelists_manage,catalog,categories,category,discounts,discount,shipping,shipping_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,communications,communication,communication_send,marketing,reporting,report_build,report_contracts_billing,report_healthindex,report_usage,config,settings,logfile,changelog,language,translations,translations_details,translation_manage,media,media_manage,media_scanner,application,maintenance,uploader,profiles,vin,shopping_cart,checkout,placeorder,taxes,transactions,transactions_items,invoice,order,orders,identity');
+define('adminplus_profile','dashboard,profile,buildtool,sales,accounts,account,contracts,contract,contract_manage,billing,cartests,cartest,cartest_manage,dealers,dealers_media,dealer,dealer_manage,assets,equipments,equipment,equipment_healthindex,equipment_data,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,rmas,rma,rma_manage,rma_history,rma_history_manage,buildtool,products,products_versions,products_software,products_software_versions,products_software_version,products_software_version_manage,products_attributes,products_attributes_items,products_attributes_manage,products_configurations,products_categories,products_media,product,product_manage,pricelists,pricelists_items,pricelists_manage,catalog,categories,category,discounts,discount,shipping,shipping_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,communications,communication,communication_send,marketing,reporting,report_build,report_contracts_billing,report_healthindex,report_usage,config,settings,logfile,changelog,language,translations,translations_details,translation_manage,media,media_manage,media_scanner,application,maintenance,uploader,profiles,vin,shopping_cart,checkout,placeorder,taxes,transactions,transactions_items,invoice,order,orders,identity');
/*Build*/
define('build','dashboard,profile,buildtool,firmwaretool,buildtool,products_software,application');
/*Commerce*/
diff --git a/settings/settingsviews.php b/settings/settingsviews.php
index 72cc897..eb78661 100644
--- a/settings/settingsviews.php
+++ b/settings/settingsviews.php
@@ -42,6 +42,13 @@ $all_views = [
"products",
"products_versions",
"products_software",
+ "products_software_versions",
+ "products_software_assignments",
+ "products_software_version",
+ "products_software_version_manage",
+ "products_software_version_access_rules_manage",
+ "products_software_upgrade_paths_manage",
+ "products_software_assignments",
"products_attributes",
"products_attributes_items",
"products_attributes_manage",
diff --git a/settings/translations.php b/settings/translations.php
index 0400a1d..2c06118 100644
--- a/settings/translations.php
+++ b/settings/translations.php
@@ -19,7 +19,8 @@ $general_filters = 'Filters';
$general_prev = 'Prev';
$general_page = 'Page ';
$general_page_of = ' of ';
-
+$general_first = 'First';
+$general_last = 'Last';
$general_next = 'Next';
$button_apply = 'Apply';
diff --git a/settings/translations/translations_US.php b/settings/translations/translations_US.php
index 51242bc..191aedb 100644
--- a/settings/translations/translations_US.php
+++ b/settings/translations/translations_US.php
@@ -255,6 +255,14 @@ $message_pr_1 = 'Product created successfully!';
$message_pr_2 = 'Product updated successfully!';
$message_pr_3 = 'Product deleted successfully!';
$message_no_products = 'There are no products';
+$message_sv_1 = 'Software version created successfully!';
+$message_sv_2 = 'Software version updated successfully!';
+$message_sv_3 = 'Software version deleted successfully!';
+$message_no_software_versions = 'No software versions found.';
+$software_versions_h2 = 'Software Versions';
+$software_versions_p = 'Manage software versions for products.';
+$button_create_software_version = 'Create Software Version';
+$software_version_search = 'Search versions';
$product_version_number = 'Versionnumber';
$product_version_version = 'Version';
$product_version_software = 'Software';
diff --git a/style/admin.css b/style/admin.css
index fabf786..641daef 100644
--- a/style/admin.css
+++ b/style/admin.css
@@ -46,7 +46,6 @@ header {
width: 100%;
height: 55px;
background-color: var(--color-white);
- box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.15);
}
header a {
@@ -242,7 +241,6 @@ main h2 span {
}
main .content-title {
- border-bottom: 1px solid #dbdddf;
display: flex;
}
@@ -1006,10 +1004,6 @@ main .manage-order-table .delete-item:hover {
padding-left: 5px;
}
-.table table thead tr {
- border-bottom: 1px solid #f0f1f2;
-}
-
.table table tbody tr:first-child td {
padding-top: 10px;
}
From ec20d4426752d51a8eeca67aa08579678ae8ec8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”>
Date: Mon, 15 Dec 2025 17:08:44 +0100
Subject: [PATCH 6/8] Refactor UI elements for consistency and clarity
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- Updated action buttons across multiple files to use icons (e.g., "Save" to "💾+", "Delete" to "X").
- Replaced "Cancel" button text with a left arrow (←) for a more intuitive navigation experience.
- Removed unnecessary action columns from tables to streamline the interface.
- Enhanced table rows to be clickable for better user interaction, redirecting to relevant management pages.
- Adjusted font sizes and styles in CSS for improved readability and aesthetics.
- Standardized back button functionality to use a left arrow across various pages.
---
account.php | 4 +--
account_manage.php | 6 ++---
accounts.php | 4 +--
assets/functions.php | 5 +---
buildtool.php | 2 +-
cartest.php | 4 +--
cartest_manage.php | 6 ++---
cartests.php | 4 +--
category.php | 6 ++---
communication.php | 6 ++---
communication_send.php | 2 +-
communications.php | 6 ++---
contract.php | 6 ++---
contract_manage.php | 6 ++---
contracts.php | 6 ++---
dealer.php | 4 +--
dealer_manage.php | 6 ++---
dealers.php | 4 +--
discount.php | 6 ++---
discounts.php | 4 +--
equipment.php | 10 +++-----
equipment_data.php | 2 +-
equipment_manage.php | 6 ++---
equipments.php | 6 ++---
equipments_mass_update.php | 2 +-
firmwaretool.php | 2 +-
histories.php | 4 +--
history.php | 22 ++++++----------
history_manage.php | 6 ++---
language.php | 2 +-
media_manage.php | 6 ++---
media_scanner.php | 2 +-
order.php | 6 ++---
orders.php | 4 +--
partner.php | 6 ++---
partners.php | 4 +--
pricelists.php | 4 +--
pricelists_manage.php | 6 ++---
product.php | 14 ++++-------
product_manage.php | 6 ++---
products.php | 4 +--
products_attributes.php | 4 +--
products_attributes_manage.php | 6 ++---
products_configurations.php | 6 ++---
products_software.php | 6 ++---
products_software_upgrade_paths_manage.php | 4 +--
products_software_version.php | 4 +--
products_software_version_manage.php | 4 +--
products_versions.php | 6 ++---
profile.php | 4 +--
profiles.php | 2 +-
report_contracts_billing.php | 6 ++---
report_healthindex.php | 7 +++---
rma.php | 6 ++---
rma_manage.php | 4 +--
rmas.php | 4 +--
servicereport.php | 4 ++-
servicereports.php | 2 +-
settings.php | 2 +-
shipping.php | 6 ++---
shipping_manage.php | 6 ++---
style/admin.css | 29 ++++++----------------
tax.php | 4 +--
translation_manage.php | 6 ++---
translations.php | 4 +--
user.php | 6 ++---
users.php | 6 ++---
67 files changed, 153 insertions(+), 216 deletions(-)
diff --git a/account.php b/account.php
index dab91a7..d270157 100644
--- a/account.php
+++ b/account.php
@@ -56,10 +56,10 @@ template_header('Account', 'account', 'view');
$view = '
'.$account_h2.' - '.$_GET['rowID'].'
-
'.$button_cancel.'
+
←
';
if ($update_allowed === 1){
- $view .= '
Edit';
+ $view .= '
✏️';
}
$view .= '
';
diff --git a/account_manage.php b/account_manage.php
index 211774d..23e2cc2 100644
--- a/account_manage.php
+++ b/account_manage.php
@@ -133,14 +133,14 @@ $view ='