Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

j2html / css tweaks #123

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

j2html / css tweaks #123

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7d65bdf
j2html css tweaks
newlinewebdesign Nov 24, 2024
2087461
css updates
newlinewebdesign Nov 24, 2024
f944364
css updates
newlinewebdesign Nov 24, 2024
8e0f6ce
css updates replace margin-left/right with margin-inline-start/end
newlinewebdesign Nov 25, 2024
14bb816
update j2html with bootstrap 5 html and classes
newlinewebdesign Nov 25, 2024
f506866
Update administrator/components/com_j2store/helpers/j2html.php
newlinewebdesign Nov 25, 2024
73970b0
Update media/j2store/css/J4/j2store_admin.css
newlinewebdesign Nov 25, 2024
62cc192
Update media/j2store/css/J4/j2store_admin.css
newlinewebdesign Nov 25, 2024
66b8014
Update media/j2store/css/J4/j2store_admin.css
newlinewebdesign Nov 25, 2024
c7cf09d
,inventory-form-control updated width
j2commerce Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 135 additions & 39 deletions administrator/components/com_j2store/helpers/j2html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ public static function price($name, $value = null, $options = array())

// return price input
$html = '';
$html .= '<div class="input-prepend">';
$html .= '<div class="input-group">';
if (!empty($symbol)) {
$html .= '<span class="add-on">' . $symbol . '</span>';
$html .= '<span class="input-group-text">' . $symbol . '</span>';
}
$html .= '<input type="text" name="' . $name . '" value="' . $value . '" ' . $optionvalue . ' />';
$html .= '</div>';
Expand All @@ -87,9 +87,9 @@ public static function price_with_data($prefix, $primary_key, $name, $value, $op
$value = str_replace(str_split('\\/:*?"<>|+-'),'',$value);
// return price input
$html = '';
$html .= '<div class="input-prepend">';
$html .= '<div class="input-group">';
if (!empty($symbol)) {
$html .= '<span class="add-on">' . $symbol . '</span>';
$html .= '<span class="input-group-text">' . $symbol . '</span>';
}
$html .= '<input type="text" name="' . $prefix . $name . '" value="' . $value . '" ' . $optionvalue . ' />';
$html .= '</div>';
Expand Down Expand Up @@ -213,22 +213,10 @@ public static function radioBooleanList($name, $value = '', $options = [])
$html = '';
$id = $options['id'] ?? $name;

// Display label if hide_label is not set or empty
if (empty($options['hide_label'])) {
$html .= '<div class="control-group">';
$labelText = $options['label_text'] ?? Text::_('JGLOBAL_YES');
$html .= self::label($labelText, $options);
}

// Use HTMLHelper to generate the boolean list with localized labels for yes/no
$attribs = [];
$html .= HTMLHelper::_('select.booleanlist', $name, $attribs, $value, Text::_('JYES'), Text::_('JNO'), $id);

// Close the control group div if label is displayed
if (empty($options['hide_label'])) {
$html .= '</div>';
}

return $html;
}

Expand Down Expand Up @@ -663,7 +651,7 @@ public static function country($name, $value, $options)
$country_id = isset($options['id']) && $options['id'] ? $options['id'] : 'country_id';
$zone_id = isset($options['zone_id']) && $options['zone_id'] ? $options['zone_id'] : 'zone_id';
$zone_value = isset($options['zone_value']) && $options['zone_value'] ? $options['zone_value'] : '';
$attr = array("onchange" => "changeZone('$country_id',this.value,'$zone_id',$zone_value)", 'id' => $country_id);
$attr = array("onchange" => "changeZone('$country_id',this.value,'$zone_id',$zone_value)", 'id' => $country_id, 'class' => 'form-select');
return self::select()->clearState()
->idTag($country_id)
->type('genericlist')
Expand All @@ -684,7 +672,7 @@ public static function country($name, $value, $options)
public static function zone($name, $value, $options)
{
$zone_id = isset($options['id']) && $options['id'] ? $options['id'] : 'zone_id';
$attr = array('id' => $zone_id);
$attr = array('id' => $zone_id, 'class' => 'form-select');
return self::select()->clearState()
->idTag($zone_id)
->type('genericlist')
Expand All @@ -709,13 +697,13 @@ public static function queueKey($name, $value,$options)
$queue_key = $config->get ( 'queue_key','' );
$url = 'index.php?option=com_j2store&view=configuration&task=regenerateQueuekey';
if(empty( $queue_key )){
$queue_string = JFactory::getConfig ()->get ( 'sitename','' ).time ();
$queue_string = Factory::getApplication()->getConfig()->get ( 'sitename','' ).time ();
$queue_key = md5 ( $queue_string );
$config->saveOne ( 'queue_key', $queue_key );
}

$html = '';
$html .= '<div class="alert alert-block alert-info"><strong id="j2store_queue_key">'.$queue_key.'</strong>&nbsp;&nbsp;&nbsp;<a onclick="regenerateQueueKey()" class="btn btn-danger">'.Text::_ ( 'J2STORE_STORE_REGENERATE' ).'</a>
$html .= '<div class="alert alert-block alert-info"><strong id="j2store_queue_key">'.$queue_key.'</strong><a onclick="regenerateQueueKey()" class="btn btn-primary btn-sm text-white ms-3"><span class="fas fa-solid fa-redo me-2" aria-hidden="true"></span>'.Text::_ ( 'J2STORE_STORE_REGENERATE' ).'</a>
<script>
function regenerateQueueKey(){
(function($){
Expand Down Expand Up @@ -758,7 +746,7 @@ public static function cronLastHit($name,$value,$options){
public static function customLink($name,$value,$options){
$id = isset($options['id']) && $options['id'] ? $options['id'] : $name;
$text = isset($options['text']) && $options['text'] ? $options['text'] : '';
return '<a class="btn btn-warning" id="'.$id.'" href="#">'.Text::_($text).'</a>';
return '<a class="btn btn-primary btn-sm" id="'.$id.'" href="#">'.Text::_($text).'</a>';
}

public static function menuItems($name,$value,$options){
Expand Down Expand Up @@ -817,13 +805,18 @@ public static function menuItems($name,$value,$options){
)
);
}else {
$html = \Joomla\CMS\HTML\HTMLHelper::_(
'select.groupedlist', $groups, $name,
array(
'list.attr' => implode(' ',$options), 'id' => $id, 'list.select' => $value, 'group.items' => null, 'option.key.toHtml' => false,
'option.text.toHtml' => false,
)
);
$attr = [
'id' => $id,
'list.select' => $value,
'option.key.toHtml' => false,
'option.text.toHtml' => false,
'group.items' => null,
'list.attr' => [
implode(' ',$options),
'class' => 'form-select'
]
];
$html = HTMLHelper::_('select.groupedlist', $groups, $name, $attr);
}
return $html;
}
Expand Down Expand Up @@ -1351,7 +1344,7 @@ public static function getOrderStatusHtml($id)
$html = '';
$item = F0FModel::getTmpInstance('OrderStatuses', 'J2StoreModel')->getItem($id);
if ($id) {
$html .= '<label class="label ' . $item->orderstatus_cssclass . '">' . Text::_($item->orderstatus_name) . '</label>';
$html .= '<label class="label badge ' . $item->orderstatus_cssclass . '">' . Text::_($item->orderstatus_name) . '</label>';
}
return $html;
}
Expand Down Expand Up @@ -1536,6 +1529,50 @@ public static function checkboxlist($data, $name, $attribs = null, $optKey = 'va
return $html;
}

public static function checkboxswitch($data, $name, $attribs = null, $optKey = 'value', $optText = 'text', $selected = null, $idtag = false,
$translate = false)
{
reset($data);

if (is_array($attribs)) {
$attribs = J2Store::platform()->toString($attribs);
}

$id_text = $idtag ? $idtag : $name;

$html = '<div class="form-check form-switch">';

foreach ($data as $obj) {
$k = $obj->$optKey;
$t = $translate ? Text::_($obj->$optText) : $obj->$optText;
$id = (isset($obj->id) ? $obj->id : null);

$extra = '';
$id = $id ? $obj->id : $id_text . $k;

if (is_array($selected)) {
foreach ($selected as $val) {
$k2 = is_object($val) ? $val->$optKey : $val;

if ($k == $k2) {
$extra .= ' selected="selected" ';
break;
}
}
} else {
$extra .= ((string)$k == (string)$selected ? ' checked="checked" ' : '');
}

$html .= '<input type="checkbox" name="' . $name . '" id="' . $id . '" value="' . $k . '" ' . $extra. $attribs . ' >';
$html .= '<label for="' . $id . '" id="' . $id . '-lbl" class="form-check-label">';
$html .= $t;
$html .= '</label>';
}
$html .= '</div>';

return $html;
}

/**
* Method to return PRO feature notice
*
Expand Down Expand Up @@ -1637,23 +1674,15 @@ public static function fieldSQL($name, $field, $item)

if (!empty($field['key_field']) && !empty($query) && !empty($item->$name)) {
// Get the database instance
if (version_compare(JVERSION, '3.99.99', 'lt')) {
$db = JFactory::getDbo();
} else {
$db = Factory::getContainer()->get('DatabaseDriver');
}
$db = Factory::getContainer()->get('DatabaseDriver');

// Properly escape column and value
$query .= ' WHERE ' . $db->quoteName($field['key_field']) . ' = ' . $db->quote($item->$name);
}

if (!empty($query)) {
try {
if (version_compare(JVERSION, '3.99.99', 'lt')) {
$db = JFactory::getDbo();
} else {
$db = Factory::getContainer()->get('DatabaseDriver');
}
$db = Factory::getContainer()->get('DatabaseDriver');
$field_data = $db->setQuery($query)->loadObject();
$value_field = $field['value_field'] ?? '';
$html = $field_data->$value_field ?? '';
Expand Down Expand Up @@ -1752,6 +1781,73 @@ public static function fieldCore($name, $field, $item){

return $html;
}
public static function calculateDaysFromStartDate($customer_start_date)
{
$startDate = new DateTime($customer_start_date);
$currentDate = new DateTime();
$interval = $startDate->diff($currentDate);
return $interval->days;
}
public static function getCustomerStartDate($orders)
{
if (!empty($orders) && isset($orders[0]->created_on)) {
return $orders[0]->created_on;
}
return null;
}
public static function getGrossCustomerSales($orders)
{
$total = 0;
foreach ($orders as $order) {
// Check if orderstatus_cssclass is set and does not contain 'danger', 'important', or 'warning'
if (isset($order->orderstatus_cssclass) &&
!str_contains($order->orderstatus_cssclass, 'danger') &&
!str_contains($order->orderstatus_cssclass, 'important') &&
!str_contains($order->orderstatus_cssclass, 'warning'))
{
$total += (float) $order->order_total;
}
}
return $total;
}
public static function getSumCustomerOrders($orders)
{
foreach ($orders as $order) {
// Ensure orderstatus_cssclass is set and does not contain 'danger', 'important', or 'warning'
if (isset($order->orderstatus_cssclass) &&
!str_contains($order->orderstatus_cssclass, 'danger') &&
!str_contains($order->orderstatus_cssclass, 'important') &&
!str_contains($order->orderstatus_cssclass, 'warning'))
{
$count++;
}
}
return $count;
}
public static function countUserOrders($userId)
{
$db = Factory::getContainer()->get('DatabaseDriver');
$query = $db->getQuery(true)
->select('COUNT(*)')
->from($db->quoteName('#__j2store_orders'))
->where($db->quoteName('user_id') . ' = ' . (int) $userId);
$db->setQuery($query);
$count = $db->loadResult();
return $count;
}

public static function getUserOrders($user_id)
{
$db = Factory::getContainer()->get('DatabaseDriver');
$query = $db->getQuery(true)
->select('*')
->from($db->quoteName('#__j2store_orders'))
->where($db->quoteName('user_id') . ' = ' . (int) $user_id);
$db->setQuery($query);
$orders = $db->loadObjectList();
return $orders;
}

}

class J2Select extends JObject
Expand Down
Loading