pcwvanbeers/assetmgt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMXX - Categories and catalog enhancements

Browse Source
This commit is contained in:
“VeLiTi”
2025-01-31 17:03:31 +01:00
parent a669b2fadf
commit 754359f6b6
10 changed files with 234 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/v2/get/catalog.php
View File

@@ -128,10 +128,15 @@ foreach ($pricelist as $price) {
$keys_to_remove = ['status','item_status','group_status','version','config','sn','build','softwareversion','healthindex','salesflag','configurable','updatedby','createdby','updated','created'];
removeKeysRecursive($catalog,$keys_to_remove);
//------------------------------------------
//Catalog processor to split versions as new product
//------------------------------------------
$messages = processProductCollection($catalog);
//------------------------------------------
//JSON_ENCODE
//------------------------------------------
$messages = json_encode($catalog, JSON_UNESCAPED_UNICODE);
$messages = json_encode($messages, JSON_UNESCAPED_UNICODE);
//------------------------------------------
//Send results

118
api/v2/get/categories.php Normal file
View File

@@ -0,0 +1,118 @@
<?php
defined($security_key) or exit;
//------------------------------------------
// categories
//------------------------------------------
//Connect to DB
$pdo = dbConnect($dbname);
//SoldTo is empty
if (empty($partner->soldto) || $partner->soldto == ''){$soldto_search = '%';} else {$soldto_search = '-%';}
//default whereclause
$whereclause = '';
switch ($permission) {
case '4':
$whereclause = '';
break;
case '3':
$whereclause = '';
break;
default:
$condition = '__salesid___'.$partner->salesid.'___soldto___'.substr($partner->soldto, 0, strpos($partner->soldto, "-")).$soldto_search;
$whereclause = 'WHERE accounthierarchy like "'.$condition.'"';
break;
}
//NEW ARRAY
$criterias = [];
$clause = '';
//Check for $_GET variables and build up clause
if(isset($get_content) && $get_content!=''){
//GET VARIABLES FROM URL
$requests = explode("&", $get_content);
//Check for keys and values
foreach ($requests as $y){
$v = explode("=", $y);
//INCLUDE VARIABLES IN ARRAY
$criterias[$v[0]] = $v[1];
if ($v[0] == 'page' || $v[0] =='p' || $v[0] =='totals' || $v[0] =='list' || $v[0] =='history'|| $v[0] =='success_msg'){
//do nothing
}
elseif ($v[0] == 'search') {
//build up search
$clause .= ' AND name like :'.$v[0];
}
else {//create clause
$clause .= ' AND '.$v[0].' = :'.$v[0];
}
}
if ($whereclause == '' && $clause !=''){
$whereclause = 'WHERE '.substr($clause, 4);
} else {
$whereclause .= $clause;
}
}
//Define Query
if(isset($criterias['totals']) && $criterias['totals'] ==''){
//Request for total rows
$sql = 'SELECT count(*) as count FROM categories '.$whereclause.'';
}
else {
//SQL for Paging
$sql = 'SELECT * FROM categories '.$whereclause.' LIMIT :page,:num_products';
}
$stmt = $pdo->prepare($sql);
//Bind to query
if (str_contains($whereclause, ':condition')){
$stmt->bindValue('condition', $condition, PDO::PARAM_STR);
}
if (!empty($criterias)){
foreach ($criterias as $key => $value){
$key_condition = ':'.$key;
if (str_contains($whereclause, $key_condition)){
if ($key == 'search'){
$search_value = '%'.$value.'%';
$stmt->bindValue($key, $search_value, PDO::PARAM_STR);
}
else {
$stmt->bindValue($key, $value, PDO::PARAM_STR);
}
}
}
}
//Add paging details
if(isset($criterias['totals']) && $criterias['totals']==''){
$stmt->execute();
$messages = $stmt->fetch();
$messages = $messages[0];
}
else {
$current_page = isset($criterias['p']) && is_numeric($criterias['p']) ? (int)$criterias['p'] : 1;
$stmt->bindValue('page', ($current_page - 1) * $page_rows_categories, PDO::PARAM_INT);
$stmt->bindValue('num_products', $page_rows_categories, PDO::PARAM_INT);
//Excute Query
$stmt->execute();
//Get results
$messages = $stmt->fetchAll(PDO::FETCH_ASSOC);
}
//------------------------------------------
//JSON_ENCODE
//------------------------------------------
$messages = json_encode($messages, JSON_UNESCAPED_UNICODE);
//Send results
echo $messages;
?>

35
api/v2/get/products.php
View File

@@ -46,15 +46,10 @@ if(isset($get_content) && $get_content!=''){
}
elseif ($v[0] == 'search') {
//build up search
$clause .= ' AND productcode like :'.$v[0];
}
elseif ($v[0] == 'list' && $v[1] == 'price') {
//Add default selection criteria for LIST
$clause .= ' AND salesflag = 1';
$clause .= ' AND item_status = 1';
$clause .= ' AND p.productcode like :'.$v[0];
}
else {//create clause
$clause .= ' AND '.$v[0].' = :'.$v[0];
$clause .= ' AND p.'.$v[0].' = :'.$v[0];
}
}
if ($whereclause == '' && $clause !=''){
@@ -66,43 +61,43 @@ if(isset($get_content) && $get_content!=''){
//Define Query
if(isset($criterias['totals']) && $criterias['totals'] ==''){
//Request for total rows
$sql = 'SELECT count(*) as count FROM products '.$whereclause.'';
$sql = 'SELECT count(*) as count FROM products p '.$whereclause.'';
}
elseif (isset($criterias['list']) && $criterias['list'] =='') {
//SQL for Paging
$sql = 'SELECT * FROM products '.$whereclause.'';
$sql = 'SELECT * FROM products p '.$whereclause.'';
}
elseif (isset($criterias['list']) && $criterias['list'] =='price'){
//SET SPECIFIC WHERECLAUSE
if ($whereclause == ''){
$whereclause_1 = 'WHERE salesflag = 1';
$whereclause_2 = 'WHERE item_status = 1';
$whereclause_1 = 'WHERE p.salesflag = 1';
$whereclause_2 = 'WHERE pat.item_status = 1';
} else {
$whereclause_1 = $whereclause .' AND salesflag = 1 AND status = 1 ';
$whereclause_2 = $whereclause .' AND item_status = 1';
$whereclause_1 = $whereclause .' AND p.salesflag = 1 AND p.status = 1 ';
$whereclause_2 = $whereclause .' AND pat.item_status = 1';
}
//GET ALL PRODUCTS AND PRODUCT ATTRIBUTES FOR PRICING
$sql = '(SELECT rowID as product_id, productname as product_name FROM products '.$whereclause_1.' ) UNION (SELECT attribute_id as product_id, item_name as product_name FROM `products_attributes_items` '.$whereclause_2.' )';
$sql = '(SELECT p.rowID as product_id, p.productname as product_name FROM products p '.$whereclause_1.' ) UNION (SELECT pat.attribute_id as product_id, pat.item_name as product_name FROM products_attributes_items pat '.$whereclause_2.' )';
}
elseif (isset($criterias['list']) && $criterias['list'] =='config'){
//SET SPECIFIC WHERECLAUSE
if ($whereclause == ''){
$whereclause_1 = 'WHERE salesflag = 1 AND status = 1 AND configurable = 0 ';
$whereclause_2 = 'WHERE group_status = 1';
$whereclause_1 = 'WHERE p.salesflag = 1 AND p.status = 1 AND p.configurable = 0 ';
$whereclause_2 = 'WHERE pag.group_status = 1';
} else {
$whereclause_1 = $whereclause .' AND salesflag = 1 AND status = 1 AND configurable = 0 ';
$whereclause_2 = $whereclause .' AND group_status = 1';
$whereclause_1 = $whereclause .' AND p.salesflag = 1 AND p.status = 1 AND p.configurable = 0 ';
$whereclause_2 = $whereclause .' AND pag.group_status = 1';
}
//GET ALL PRODUCTS AND PRODUCT ATTRIBUTES FOR PRICING
$sql = '(SELECT rowID as product_id, productname as product_name FROM products '.$whereclause_1.' ) UNION (SELECT group_id as product_id, group_name as product_name FROM `products_attributes_groups` '.$whereclause_2.' )';
$sql = '(SELECT p.rowID as product_id, p.productname as product_name FROM products p '.$whereclause_1.' ) UNION (SELECT pag.group_id as product_id, pag.group_name as product_name FROM products_attributes_groups pag '.$whereclause_2.' )';
}
else {
//SQL for Paging
$sql = 'SELECT * FROM products '.$whereclause.' LIMIT :page,:num_products';
$sql = 'SELECT p.*, m.full_path FROM products p LEFT JOIN media m ON p.product_media = m.rowID '.$whereclause.' LIMIT :page,:num_products';
}
$stmt = $pdo->prepare($sql);

8
api/v2/get/products_attributes_items.php
View File

@@ -23,7 +23,7 @@ switch ($permission) {
break;
default:
$condition = '__salesid___'.$partner->salesid.'___soldto___'.substr($partner->soldto, 0, strpos($partner->soldto, "-")).$soldto_search;
$whereclause = 'WHERE accounthierarchy like "'.$condition.'"';
$whereclause = 'WHERE pat.accounthierarchy like "'.$condition.'"';
break;
}
@@ -62,15 +62,15 @@ if(isset($get_content) && $get_content!=''){
//Define Query
if(isset($criterias['totals']) && $criterias['totals'] ==''){
//Request for total rows
$sql = 'SELECT count(*) as count FROM products_attributes_items '.$whereclause.'';
$sql = 'SELECT count(*) as count FROM products_attributes_items pat '.$whereclause.'';
} elseif ($criterias['media'] && $criterias['media'] =='all'){
//GET ALL MEDIA ITEMS RELATED TO ATTRIBUTES
$sql = 'SELECT pat.*, m.full_path FROM products_attributes_items pat LEFT JOIN media m ON pat.item_media = m.rowID '.$whereclause;
$sql = 'SELECT pat.*, m.full_path, ma.full_path as alternative_media_full_path FROM products_attributes_items pat LEFT JOIN media m ON pat.item_media = m.rowID LEFT JOIN media ma ON pat.alternative_media = ma.rowID '.$whereclause;
} elseif ($criterias['list'] && $criterias['list'] =='catalog'){
//GET ALL ATTRIBUTE DATA FOR CATALOG GROUPS,ITEMS,MEDIA
$sql = 'SELECT pag.*, pat.*, m.title, m.full_path FROM products_attributes_groups pag JOIN products_attributes_items pat ON pag.rowID = pat.group_id LEFT JOIN media m ON pat.item_media = m.rowID '.$whereclause;
$sql = 'SELECT pag.*, pat.*, m.title, m.full_path, ma.title as alternative_media_title, ma.full_path as alternative_media_full_path FROM products_attributes_groups pag JOIN products_attributes_items pat ON pag.rowID = pat.group_id LEFT JOIN media m ON pat.item_media = m.rowID LEFT JOIN media ma ON pat.alternative_media = ma.rowID '.$whereclause;
} else {
//SQL for Paging

51
assets/functions.php
View File

@@ -2983,4 +2983,55 @@ function removeKeysRecursive(array &$array, array $keysToRemove): void {
}
}
}
}
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Catalogprocessor ++++++++++++++
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++
function processProductCollection($products) {
$processedProducts = [];
foreach ($products as $key => $product) {
// Check if product has versions
if (isset($product['versions']) && !empty($product['versions'])) {
// Check if there's only one version
$singleVersion = count($product['versions']) === 1;
// For each version, create a new product entry
foreach ($product['versions'] as $version) {
// Create a copy of the base product
$versionProduct = $product;
// Remove the versions array
unset($versionProduct['versions']);
// Add version specific data
$versionProduct['version_id'] = $version['version_id'];
$versionProduct['config_setting'] = $version['config_setting'];
$versionProduct['configurations'] = $version['configurations'];
// Only modify identifiers if there's more than one version
if (!$singleVersion) {
// Create a unique rowID for the new product
$versionProduct['rowID'] = $versionProduct['rowID'] . '_v' . $version['version_id'];
// Add version suffix to productcode and url_slug
$versionProduct['productcode'] = $versionProduct['productcode'] . '_v' . $version['version_id'];
if (!empty($versionProduct['url_slug'])) {
$versionProduct['url_slug'] = $versionProduct['url_slug'] . '_v' . $version['version_id'];
}
// Add version to product name if needed
$versionProduct['productname'] = $versionProduct['productname'] . ' (v' . $version['version_id'] . ')';
}
// Add to processed products
$processedProducts[] = $versionProduct;
}
} else {
// If no versions, add product as is
$processedProducts[] = $product;
}
}
return $processedProducts;
}

6
product.php
View File

@@ -63,7 +63,7 @@ $product_software = ioServer($api_url,'');
if (!empty($product_software)){$product_software = decode_payload($product_software);}else{$product_software = null;}
//CALL TO API FOR Product_configuration
$api_url = '/v2/products_configurations/productrowid='.$_GET['rowID'];
$api_url = '/v2/products_configurations/version_status=1&productrowid='.$_GET['rowID'];
$products_configurations = ioServer($api_url,'');
//Decode Payload
if (!empty($products_configurations)){$products_configurations = json_decode($products_configurations,true);}else{$products_configurations = null;}
@@ -142,6 +142,10 @@ $view .= ' <div class="content-block order-details">
<div class="order-detail">
<h3>'.($product_slug ?? 'Product_slug').'</h3>
<p>'.(${$responses->url_slug} ?? $responses->url_slug).'</p>
</div>
<div class="order-detail">
<h3>'.($product_quantity ?? 'Quantity').'</h3>
<p>'.(${$responses->quantity} ?? $responses->quantity).'</p>
</div>';
$view .='

4
product_manage.php
View File

@@ -183,8 +183,8 @@ $view .= '<div class="content-block tab-content active">
<textarea id="description" name="productdescription" placeholder="'.$product_description.'">'.$product['productdescription'].'</textarea>
<label for="softwareversion">'.$product_software.'</label>
<input id="name" type="text" name="softwareversion" placeholder="'.$product_software.'" value="'.$product['softwareversion'].'">
<label for="price"><i class="required">*</i> '.$product_price.' </label>
<input id="price" type="number" name="price" placeholder="'.$product_price.'" min="0" step=".01" value="'.$product['price'].'" required>
<label for="price"><i class="required">*</i> '.($product_quantity ?? 'Quantity').' </label>
<input id="price" type="number" name="quantity" placeholder="'.($product_quantity ?? 'Quantity').'" min="0" step="1" value="'.$product['quantity'].'">
<input type="hidden" name="rowID" value="'.$product['rowID'].'">
<input id="source_'.$product['rowID'].'" type="hidden" name="product_media" value="'.$product['product_media'].'">
<img id="image_'.$product['rowID'].'" src="'.$product['full_path'].'" alt="" style="display: block; max-width: 75px;">

24
products_attributes_manage.php
View File

@@ -229,8 +229,8 @@ $view .= '</form>';
$view .= '
<div class="content-block">
<h2 class="responsive-width-100">'.($products_attributes_group_items ?? 'Groupitems').' <button class="btn2" onClick="addNewRow()" > + </button></h2>
<h2 class="responsive-width-100">'.($products_attributes_group_items ?? 'Groupitems').' <button class="btn2" onClick="addNewRow()" > + </button> <input form="update" class="btn2" type="submit" name="update" value="Save" class="btn"></h2>
<form action="" id="update" method="post"></form>
<form action="" id="new" method="post"></form>
@@ -243,6 +243,7 @@ $view .= '
<th>'.($products_attributes_item_quantity ?? 'quantity').'</th>
<th>'.($products_attributes_item_position ?? 'position').'</th>
<th>'.($products_attributes_item_media ?? 'media').'</th>
<th>'.($products_attributes_alternative_media ?? 'alternative').'</th>
<th>'.$general_created.'</th>
<th>'.$general_actions.'</th>
</tr>
@@ -274,15 +275,18 @@ $view .= '
<td><input form="update" id="source_'.$items['rowID'].'" type="hidden" name="attributes['.$items['rowID'].'][item_media]" value="'.$items['item_media'].'">
<img id="image_'.$items['rowID'].'" src="'.$items['full_path'].'" alt="" style="display: block; max-width: 75px;">
</td>
<td><input form="update" id="source_alt_'.$items['rowID'].'" type="hidden" name="attributes['.$items['rowID'].'][alternative_media]" value="'.$items['alternative_media'].'">
<img id="alt_'.$items['rowID'].'" src="'.$items['alternative_media_full_path'].'" alt="" style="display: block; max-width: 75px;">
</td>
<td>'.getRelativeTime($items['created']).'</td>
<td>
<button type="button" class="btn" id="openSelectorBtn" onclick="setSourceID(\''.$items['rowID'].'\'), openDialog(\'image_'.$items['rowID'].'\')">'.($button_assign_image ?? 'Assign Image').'</button>
<input form="update" type="submit" name="update" value="&" class="btn">
<button type="button" class="btn" id="openSelectorBtn" onclick="setSourceID(\''.$items['rowID'].'\'), openDialog(\'image_'.$items['rowID'].'\')">'.($button_assign_image ?? 'Media').'</button>
<button type="button" class="btn" id="openSelectorBtn" onclick="setSourceID(\'alt_'.$items['rowID'].'\'), openDialog(\'alt_'.$items['rowID'].'\')">'.($button_assign_image ?? 'Alt').'</button>
</td>
<input form="update" type="hidden" name="attributes['.$items['rowID'].'][rowID]" value="'.$items['rowID'].'" readonly>
<input form="update" type="hidden" name="attributes['.$items['rowID'].'][group_id]" value="'.$products_attributes['rowID'].'" readonly>
</tr>
</form>';
';
}
$view .= '<!-- Image Selector Dialog -->
@@ -340,8 +344,13 @@ $view .= '
//const openButton = document.getElementById(\'openSelectorBtn\');
function setSourceID(sourceid){
image_source_id = "source_"+sourceid;
image_source_src = "image_"+sourceid;
if(sourceid.substring(0,3) == "alt"){
image_source_id = "source_"+sourceid;
image_source_src = sourceid;
} else {
image_source_id = "source_"+sourceid;
image_source_src = "image_"+sourceid;
}
}
function openDialog(){
@@ -351,6 +360,7 @@ $view .= '
function selectImage(id,src) {
if (image_source_id != 0){
console.log(image_source_id);
const selectedImageInput = document.getElementById(image_source_id);
const previewImage = document.getElementById(image_source_src);

17
settings/settingsmenu.php
View File

@@ -12,9 +12,9 @@ $main_menu = array ('dashboard','sales','buildtool','cartests','marketing','equi
//Sub menus
$equipments_sub = array('equipments','servicereports','rmas','histories','firmwaretool','equipments_mass_update');
$sales_sub = array('accounts','contracts');
$sales_sub = array('accounts','contracts','catalog');
$products_sub = array('products','products_attributes','pricelists');
$admin_sub = array('users','communications','partners','media');
$admin_sub = array('users','categories','communications','partners','media');
$reporting_sub = array('report_build','report_contracts_billing','report_healthindex','report_usage');
$settings_sub = array('config','translations','logfile','maintenance','profiles');
@@ -122,6 +122,18 @@ $urls = array(
"icon" => "fa-solid fa-photo-film",
"name" => "menu_media"
),
"categories" => array(
"url" => "categories",
"selected" => "categories",
"icon" => "fa-solid fa-photo-film",
"name" => "menu_categories"
),
"catalog" => array(
"url" => "catalog",
"selected" => "catalog",
"icon" => "fa-solid fa-photo-film",
"name" => "menu_catalog"
),
"partners" => array(
"url" => "partners",
"selected" => "partners",
@@ -240,6 +252,7 @@ $page_rows_translations = 50; //list translation variables
$page_rows_products_attributes = 50; //list product attributes
$page_rows_media = 25; // list media
$page_rows_pricelists = 50;//pricelists
$page_rows_categories = 25;//categories
//------------------------------------------
// Languages supported

1
settings/settingsviews.php
View File

@@ -48,6 +48,7 @@ $all_views = [
"pricelists_items",
"pricelists_manage",
"catalog",
"categories",
"servicereports",
"servicereport",
"admin",