Update Variant Off Canvas View with Variant/Product Images

administrator/components/com_j2store/controllers/traits/list_view.php

@@ -1,16 +1,30 @@
 <?php
+/**
+ * @package J2Store
+ * @copyright Copyright (c)2014-17 Ramesh Elamathi / J2Store.org
+ * @copyright Copyright (c) 2024 J2Commerce . All rights reserved.
+ * @license GNU GPL v3 or later
+ */
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Toolbar\ToolbarFactoryInterface;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\CMS\Uri\Uri;
+
 trait list_view {
     function addBrowseToolBar(){
         $app = J2Store::platform()->application();
         $option = $app->input->getCmd('option', 'com_foobar');
         $subtitle_key = strtoupper($option . '_TITLE_' . $app->input->getCmd('view', 'cpanel'));
-        JToolBarHelper::title(JText::_(strtoupper($option)) . ': ' . JText::_($subtitle_key), str_replace('com_', '', $option));
-        JToolBarHelper::addNew();
-        JToolBarHelper::editList();
-        JToolBarHelper::publishList();
-        JToolBarHelper::unpublishList();
-        $msg = JText::_($option . '_CONFIRM_DELETE');
-        JToolBarHelper::deleteList(strtoupper($msg));
+        ToolBarHelper::title(Text::_(strtoupper($option)) . ': ' . Text::_($subtitle_key), str_replace('com_', '', $option));
+        ToolBarHelper::addNew();
+        ToolBarHelper::editList();
+        ToolBarHelper::publishList();
+        ToolBarHelper::unpublishList();
+        $msg = Text::_($option . '_CONFIRM_DELETE');
+        ToolBarHelper::deleteList(strtoupper($msg));
     }
 
     private function noToolbar() {
@@ -20,7 +34,7 @@ private function noToolbar() {
 
         // Set toolbar title
         $subtitle_key = strtoupper($option . '_TITLE_' . F0FInflector::pluralize($this->input->getCmd('view', 'cpanel')));
-        JToolBarHelper::title(JText::_(strtoupper($option)) . ': ' . JText::_($subtitle_key), $componentName);
+        ToolBarHelper::title(Text::_(strtoupper($option)) . ': ' . Text::_($subtitle_key), $componentName);
     }
 
     function editToolBar(){
@@ -30,21 +44,21 @@ function editToolBar(){
 
         // Set toolbar title
         $subtitle_key = strtoupper($option . '_TITLE_' . F0FInflector::pluralize($this->input->getCmd('view', 'cpanel'))) . '_EDIT';
-        JToolBarHelper::title(JText::_(strtoupper($option)) . ': ' . JText::_($subtitle_key), $componentName);
-        JToolBarHelper::apply();
-        JToolBarHelper::save();
-        JToolBarHelper::custom('savenew', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
-        JToolBarHelper::cancel();
+        ToolBarHelper::title(Text::_(strtoupper($option)) . ': ' . Text::_($subtitle_key), $componentName);
+        ToolBarHelper::apply();
+        ToolBarHelper::save();
+        ToolBarHelper::custom('savenew', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+        ToolBarHelper::cancel();
     }
     public function toolbarBacktodashboard(){
         $app = J2Store::platform()->application();
         $option = $app->input->getCmd('option', 'com_foobar');
         $componentName = str_replace('com_', '', $option);
         // Set toolbar title
         $subtitle_key = strtoupper($option . '_TITLE_' . F0FInflector::pluralize($this->input->getCmd('view', 'cpanel')));
-        JToolBarHelper::title(JText::_(strtoupper($option)) . ': ' . JText::_($subtitle_key), $componentName);
+        ToolBarHelper::title(Text::_(strtoupper($option)) . ': ' . Text::_($subtitle_key), $componentName);
         // Set toolbar icons
-        JToolBarHelper::back(JText::_('J2STORE_BACK_TO_DASHBOARD'), 'index.php?option=com_j2store&view=cpanel');
+        ToolBarHelper::back(Text::_('J2STORE_BACK_TO_DASHBOARD'), 'index.php?option=com_j2store&view=cpanel');
     }
     function getBaseVars(){
         $platform = J2Store::platform();
@@ -56,28 +70,14 @@ function getBaseVars(){
         $vars->action_url = 'index.php?option='.$vars->option;
         return $vars;
     }
-    /*$header  = array(
-                'id' => array(
-                    'type' => 'rowselect',
-                    'tdwidth' => '20',
-                    'label' => 'id'
-                ),
-                'name' => array(
-                    'type' => 'fieldsearchable',
-                    'sortable' => 'true',
-                    'label' => 'name'
-                )
-            );*/
+
     function setHeader($header,&$vars){
         if(empty($header)){
             $header = array();
         }
         $vars->header = $header;
     }
-    /*$items_format = array(
-        'id' => array('type' => 'selectrow'),
-        'name' => array( 'type' => 'text' , 'show_link' => 'true', url => 'index.php')
-    );*/
+
     function setItemsFormat($item_format,&$vars){
         $vars->items_format = $item_format;
     }
@@ -101,11 +101,11 @@ function _getLayoutPath($layout = 'default',$layout_type = 'list')
         $defaultPath = JPATH_ADMINISTRATOR.'/components/com_j2store/layouts/'.$layout_type.'/'.$layout.'.php';
         $additional_path = JPATH_ADMINISTRATOR.'/components/com_j2store/views/'.$view.'/tmpl/'.$layout.'.php';
         // if the site template has a layout override, use it
-        jimport('joomla.filesystem.file');
-        if (JFile::exists( $templatePath ))
+
+        if (file_exists($templatePath))
         {
             return $templatePath;
-        }elseif (JFile::exists( $defaultPath ))
+        }elseif (file_exists( $defaultPath ))
         {
             return $defaultPath;
         }
@@ -131,18 +131,18 @@ function getPageId(){
 
     protected function exportButton($view = 'orders') {
         if(!isset($view) || empty($view)) return;
-        $bar = JToolBar::getInstance('toolbar');
+        $bar = Factory::getContainer()->get(ToolbarFactoryInterface::class)->createToolbar('toolbar');
         // Add "Export to CSV"
-        $link = JURI::getInstance();
+        $link = URI::getInstance();
         $query = $link->getQuery(true);
         $query['format'] = 'csv';
         $query['option'] = 'com_j2store';
         $query['view'] = $view;
         $query['task'] = 'browse';
         $link->setQuery($query);
 
-        JToolBarHelper::divider();
+        ToolBarHelper::divider();
         $icon = 'download';
-        $bar->appendButton('Link', $icon, JText::_('J2STORE_EXPORTCSV'), $link->toString());
+        $bar->appendButton('Link', $icon, Text::_('J2STORE_EXPORTCSV'), $link->toString());
     }
 }

administrator/components/com_j2store/helpers/currency.php

@@ -1,15 +1,16 @@
 <?php
-/*------------------------------------------------------------------------
- # com_j2store - J2Store
-# ------------------------------------------------------------------------
-# author    Sasi varna kumar - Weblogicx India http://www.weblogicxindia.com
-# copyright Copyright (C) 2014 - 19 Weblogicxindia.com. All Rights Reserved.
-# @license - http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
-# Websites: http://j2store.org
-# Technical Support:  Forum - http://j2store.org/forum/index.html
--------------------------------------------------------------------------*/
-// no direct access
+/**
+ * @package J2Store
+ * @copyright Copyright (c)2014-17 Ramesh Elamathi / J2Store.org
+ * @copyright Copyright (c) 2024 J2Commerce . All rights reserved.
+ * @license GNU GPL v3 or later
+ */
+
+
+// No direct access to this file
 defined('_JEXEC') or die('Restricted access');
+use Joomla\CMS\Factory;
+
 
 class J2Currency {
   	private $code;
@@ -26,8 +27,8 @@ class J2Currency {
 
   	public function __construct($config=array()) {
 
-		$this->session = JFactory::getSession();
-		$this->input = JFactory::getApplication()->input;
+		$this->session = Factory::getApplication()->getSession();
+		$this->input = Factory::getApplication()->input;
 
 		if(count($this->currencies) < 1) {
 			$rows = F0FModel::getTmpInstance('Currencies', 'J2StoreModel')->enabled(1)->getList();
@@ -182,6 +183,9 @@ public function getThousandSymbol($currency=''){
 			return 0;
 		}
 	}
+	public function getThousandSysmbol($currency=''){ // kept for backwards compatibility with those who use layout overrides on the template
+		return $this->getThousandSymbol($currency);
+	}
 
   	public function getCode() {
     	return $this->code;
@@ -396,4 +400,4 @@ public static function getNumericCode(){
 
   		return $result;
   	}
-}
+}

administrator/components/com_j2store/layouts/edit/tab.php

@@ -1,14 +1,29 @@
 <?php
+/**
+ * @package J2Store
+ * @copyright Copyright (c)2014-17 Ramesh Elamathi / J2Store.org
+ * @copyright Copyright (c) 2024 J2Commerce . All rights reserved.
+ * @license GNU GPL v3 or later
+ */
+
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Uri\Uri;
+
 defined('_JEXEC') or die;
 $platform = J2Store::platform();
 $platform->loadExtra('behavior.formvalidator');
 $row_class = 'row';
 $col_class = 'col-md-';
-$alert_html = '<joomla-alert type="danger" close-text="Close" dismiss="true" role="alert" style="animation-name: joomla-alert-fade-in;"><div class="alert-heading"><span class="error"></span><span class="visually-hidden">Error</span></div><div class="alert-wrapper"><div class="alert-message" >'.JText::_('J2STORE_INVALID_INPUT_FIELD').'</div></div></joomla-alert>' ;
+$alert_html = '<joomla-alert type="danger" close-text="Close" dismiss="true" role="alert" style="animation-name: joomla-alert-fade-in;"><div class="alert-heading"><span class="error"></span><span class="visually-hidden">Error</span></div><div class="alert-wrapper"><div class="alert-message" >'.Text::_('J2STORE_INVALID_INPUT_FIELD').'</div></div></joomla-alert>' ;
 if (version_compare(JVERSION, '3.99.99', 'lt')) {
     $row_class = 'row-fluid';
     $col_class = 'span';
-    $alert_html = '<div class="alert alert-error alert-danger">'.JText::_('J2STORE_INVALID_INPUT_FIELD').'<button type="button" class="close" data-dismiss="alert">×</button></div>' ;
+    $alert_html = '<div class="alert alert-error alert-danger">'.Text::_('J2STORE_INVALID_INPUT_FIELD').'<button type="button" class="close" data-dismiss="alert">×</button></div>' ;
 }
 ?>
 <script  type="text/javascript">
@@ -33,72 +48,62 @@
 <div class="<?php echo $row_class;?>">
     <div class="<?php echo $col_class;?>12">
         <div class="j2store_<?php echo $vars->view;?>_edit">
-            <form id="adminForm" class="form-horizontal form-validate" action="<?php echo $vars->action_url?>" method="post" name="adminForm">
+            <form id="adminForm" class="form-validate" action="<?php echo $vars->action_url?>" method="post" name="adminForm">
                 <?php echo J2Html::hidden('option','com_j2store');?>
                 <?php echo J2Html::hidden('view',$vars->view);?>
                 <?php if(isset($vars->primary_key) && !empty($vars->primary_key)): ?>
                     <?php echo J2Html::hidden($vars->primary_key,$vars->id);?>
                 <?php endif; ?>
                 <?php echo J2Html::hidden('task', '', array('id'=>'task'));?>
-                <?php echo JHTML::_( 'form.token' ); ?>
+                <?php echo HTMLHelper::_( 'form.token' ); ?>
                 <div class="<?php echo $row_class;?>">
                     <?php if(isset($vars->field_sets) && !empty($vars->field_sets)):?>
-                        <?php if (version_compare(JVERSION, '3.99.99', 'lt')):?>
-                            <?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'basic_options')); ?>
-                        <?php else: ?>
-                            <?php echo \Joomla\CMS\HTML\HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => 'basic_options', 'recall' => true, 'breakpoint' => 768]); ?>
-                        <?php endif; ?>
+	                    <?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => 'basic_options', 'recall' => true, 'breakpoint' => 768]); ?>
                         <?php foreach ($vars->field_sets as $field_set):?>
                             <?php if(isset($field_set['fields']) && !empty($field_set['fields'])):?>
-                                <?php if (version_compare(JVERSION, '3.99.99', 'lt')):?>
-                                    <?php echo JHtml::_('bootstrap.addTab', 'myTab', $field_set['id'], JText::_($field_set['label'])); ?>
-                                <?php else: ?>
-                                    <?php echo \Joomla\CMS\HTML\HTMLHelper::_('uitab.addTab', 'myTab', $field_set['id'], JText::_($field_set['label'])); ?>
-                                <?php endif; ?>
-                                <div <?php echo isset($field_set['id']) && $field_set['id'] ? 'id="'.$field_set['id'].'"': '';?>
-                                    <?php echo isset($field_set['class']) && is_array($field_set['class']) ? 'class="'.implode(' ',$field_set['class']).'"': '';?>
-                                >
-                                    <?php /*if(isset($field_set['label']) && !empty($field_set['label'])):*/?><!--
-                                        <h3><?php /*echo JText::_($field_set['label']);*/?></h3>
-                                    --><?php /*endif; */?>
+			                    <?php echo HTMLHelper::_('uitab.addTab', 'myTab', $field_set['id'], Text::_($field_set['label'])); ?>
+                                <fieldset <?php echo isset($field_set['id']) && $field_set['id'] ? 'id="'.$field_set['id'].'"': '';?>
+                                    <?php echo $field_set['class'] ? 'class="'.$field_set['class'].'"': '';?>
+
+                                    <?php echo isset($field_set['class']) && is_array($field_set['class']) ? 'class="'.implode(' ',$field_set['class']).'"': '';?>>
+                                    <legend><?php echo Text::_($field_set['label']);?></legend>
                                     <?php if(isset($field_set['is_pro']) && $field_set['is_pro'] && J2Store::isPro() != 1):?>
                                         <?php echo J2Html::pro();?>
                                     <?php else: ?>
-                                        <?php foreach ($field_set['fields'] as $field_name => $field):?>
-                                            <?php $is_required = isset($field['options']['required']) && !empty($field['options']['required']) ? true:false;?>
-                                            <div class="control-group">
-                                                <label class="control-label">
-                                                    <?php if(isset($field['label']) && !empty($field['label'])):?>
-                                                        <?php echo JText::_($field['label']);?><?php echo $is_required ? "<span>*</span>": '';?>
-                                                    <?php endif; ?>
-                                                </label>
-                                                <div class="controls">
-                                                    <?php if(isset($field['type']) && in_array($field['type'],array('number','text','email','password','textarea','file','radio','checkbox','button','submit','hidden'))):?>
-                                                        <?php echo J2Html::input($field['type'],$field['name'],$field['value'],$field['options']);?>
-                                                    <?php else:?>
-                                                        <?php echo J2Html::custom($field['type'],$field['name'],$field['value'],$field['options']);?>
-                                                    <?php endif; ?>
-                                                    <?php if(isset($field['desc']) && !empty($field['desc'])):?>
-                                                        <br>
-                                                        <small><?php echo JText::_($field['desc']);?></small>
-                                                    <?php endif; ?>
+                                        <div class="form-grid">
+	                                        <?php foreach ($field_set['fields'] as $field_name => $field):?>
+		                                        <?php $is_required = isset($field['options']['required']) && !empty($field['options']['required']) ? true:false;?>
+                                                <div class="control-group">
+                                                    <?php if($field['options']['hiddenLabel'] != true):?>
+                                                        <div class="control-label">
+                                                            <label>
+                                                                <?php if(isset($field['label']) && !empty($field['label'])):?>
+                                                                    <?php echo Text::_($field['label']);?><?php echo $is_required ? "<span>*</span>": '';?>
+                                                                <?php endif; ?>
+                                                            </label>
+                                                        </div>
+                                                    <?php endif;?>
+                                                    <div class="controls">
+				                                        <?php if(isset($field['type']) && in_array($field['type'],array('number','text','email','password','textarea','file','radio','checkbox','button','submit','hidden'))):?>
+					                                        <?php echo J2Html::input($field['type'],$field['name'],$field['value'],$field['options']);?>
+				                                        <?php else:?>
+					                                        <?php echo J2Html::custom($field['type'],$field['name'],$field['value'],$field['options']);?>
+				                                        <?php endif; ?>
+				                                        <?php if(isset($field['desc']) && !empty($field['desc'])):?>
+                                                            <div class="hide-aware-inline-help">
+                                                                <small class="form-text"><?php echo Text::_($field['desc']);?></small>
+                                                            </div>
+				                                        <?php endif; ?>
+                                                    </div>
                                                 </div>
-                                            </div>
-                                        <?php endforeach; ?>
+	                                        <?php endforeach; ?>
+                                        </div>
                                     <?php endif; ?>
-                                </div>
-                                <?php if (version_compare(JVERSION, '3.99.99', 'lt')):?>
-                                    <?php echo JHtml::_('bootstrap.endTab'); ?>
-                                <?php else: ?>
-                                    <?php echo \Joomla\CMS\HTML\HTMLHelper::_('uitab.endTab'); ?>
-                                <?php endif; ?>
+                                </fieldset>
+			                    <?php echo HTMLHelper::_('uitab.endTab'); ?>
                             <?php endif; ?>
                         <?php endforeach;?>
-                        <?php if (version_compare(JVERSION, '3.99.99', 'lt')):?>
-                            <?php echo JHtml::_('bootstrap.endTabSet'); ?>
-                        <?php else: ?>
-                            <?php echo \Joomla\CMS\HTML\HTMLHelper::_('uitab.endTabSet'); ?>
-                        <?php endif; ?>
+	                    <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
                     <?php endif; ?>
                 </div>
             </form>