Merge branch 'rel_ionCube_PHP56-70' of github.com:d3datadevelopment/contenttabs into rel_ionCube_PHP56-70
# Conflicts: # README.md # changelog.md # composer.json # docs/Precheck/d3precheck.php # docs/Precheck/modules/d3/contenttabs/Application/Controller/Admin/d3precheckinfolder.php # docs/Precheck/modules/d3/contenttabs/Setup/d3precheckinfolder.php # docs/Precheck/modules/d3/contenttabs/d3precheckinfolder.php # src/Application/Controller/Admin/contentTabList.php # src/Application/Controller/Admin/contentTabs.php # src/Application/Controller/Admin/settings.php # src/Application/Controller/Admin/support.php # src/Application/Model/contentTabs.php # src/Application/translations/de/d3_contenttabs_lang.php # src/Application/views/admin/de/d3_contenttabs_lang.php # src/Application/views/admin/tpl/contentTabList.tpl # src/Application/views/admin/tpl/contentTabs.tpl # src/IntelliSenseHelper.php # src/Setup/setupWizard.php # src/menu.xml # src/metadata.php # src/modules/Application/Component/Widget/d3_oxwarticledetails_contenttabs.php # src/modules/Application/Model/d3_oxarticle_longtexts.php
This commit is contained in:
commit
9fe3684892
|
|
@ -1,98 +0,0 @@
|
|||
4.0.0.0
|
||||
- Kompatibilität und Support ab Oxid 6.0.0
|
||||
- Integration eines eigenen Admin-Bereich "D³ Content Tabs"
|
||||
- Titel und Langtexte der Tabs werden in einer eigenen Tabelle gespeichert
|
||||
- Langtexte haben eine "Aktiv" - Option erhalten, welche im Frontend zusätzlich geprüft wird
|
||||
- Altlasten und unnötige Dateien entfernt
|
||||
|
||||
3.2.0.1
|
||||
- Support für Apache 2.4
|
||||
- Paketbereitstellung für ionCube
|
||||
|
||||
3.2.0.0
|
||||
- drop: techn. Support für Shopversionen 4.7.x eingestellt
|
||||
- add: Freigabe für 4.10.x
|
||||
- add: Prüfung auf gültige Modul-Dateien implementiert
|
||||
- add feature: Support für Oxid-Theme Flow
|
||||
|
||||
3.1.0.2
|
||||
- bugfix: "Shop offline" Anzeige nach der Wahl einer Variante im Frontend
|
||||
- bugfix: gepflegte Tab-Inhalte wurden nicht angezeigt
|
||||
|
||||
3.1.0.1
|
||||
- automatische Installation aufgeteilt, Anlegen der Datenbankfelder erfolgt "step by step"
|
||||
- Übernahme Moduleigener Templates in copy_this und Verweis zur Überladung siehe FAQ
|
||||
- fehlende Übersetzungen im Shopadmin nachgetragen
|
||||
- Modulfreigabe für php5.5 und php5.6
|
||||
- Aktualisierung Vorabprüfung und Installationsanleitung
|
||||
|
||||
3.1.0.0
|
||||
- support for mobile-themes
|
||||
- adjustment of the structure
|
||||
- update precheck
|
||||
|
||||
3.0.1.0
|
||||
- Module compatible with Shopvesion 4.8.7
|
||||
- Show Message in Backend if Module is not active
|
||||
- rename module-tab-Templates
|
||||
- adjustment of the structure
|
||||
- delete deprecated files in autoupdate
|
||||
- fix module entrys in shopconfiguration
|
||||
|
||||
3.0.0.3
|
||||
- Update Precheck
|
||||
|
||||
3.0.0.2
|
||||
- bugfix for saving longdesc in admin
|
||||
|
||||
3.0.0.1
|
||||
- bugfix when module is inactive, tabs will be shown in frontend
|
||||
|
||||
3.0.0.0
|
||||
- restructured for 4.7 / 5.0
|
||||
|
||||
2.4.6.0
|
||||
- tab content moved to templates, add extendable blocks
|
||||
|
||||
2.4.5.0 2012-09-05
|
||||
- added 4.6.0 functionality
|
||||
|
||||
2.4.4 2012-05-31
|
||||
- bug fix: javaScript fallback causes shop-in-tab-problem
|
||||
|
||||
2.4.3 2011-11-02
|
||||
- added templates for 451 - 454
|
||||
- added javaScript fallback for non js user
|
||||
|
||||
2.4.2 2011-09-19
|
||||
- bug fix price doesn't save
|
||||
- bug fix showed empty tabs
|
||||
|
||||
2.4.1 2011-08-16
|
||||
- inheritance implemented
|
||||
- bug in save function fixed
|
||||
|
||||
2.4.0 2011-07-19
|
||||
- restructured
|
||||
- removed Ajax lib, switched to jQuery
|
||||
- removed ox_cmp module
|
||||
- renamed fields (from oxlongdescXXX to d3longdescXXX) in database
|
||||
- added 4.5.0 templates
|
||||
|
||||
2.1 2009-11-13
|
||||
- Xajax-Implementierung au neues Intergrationsschema umgestellt
|
||||
- langtext- und templatebasierte Versionen zusammengeführt
|
||||
- Fallback-Funktion für Nicht-JavaScript-Einsatz
|
||||
- Langtexte in einem Admin-Tab zusammengefaßt
|
||||
- Langtext mehrsprachig verfügbar
|
||||
|
||||
2.0 2009-08-26
|
||||
- auf PE4 portiert
|
||||
|
||||
1.1 PE3 (tpl) 2008-09-22
|
||||
- Fallback-Funktion für Nicht-JavaScript-Einsatz
|
||||
- Attribute und Bewertungen stehen nun ebenfalls zur Verfügung
|
||||
|
||||
1.0 PE3 2008-09-12
|
||||
- Grundfunktion zum Modul komplettiert
|
||||
- Scriptbasis ist aktuelles Xajax-Integrationsschema
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* This Software is the property of Data Development and is protected
|
||||
* by copyright law - it is NOT Freeware.
|
||||
*
|
||||
* Any unauthorized use of this software without a valid license
|
||||
* is a violation of the license agreement and will be prosecuted by
|
||||
* civil and criminal law.
|
||||
*
|
||||
* http://www.shopmodule.com
|
||||
*
|
||||
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
||||
* @author D3 Data Development - Daniel Seifert <support@shopmodule.com>
|
||||
* @link http://www.oxidmodule.com
|
||||
*/
|
||||
|
||||
namespace D3\Contenttabs\Modules\Application\Component\Widget;
|
||||
|
||||
/**
|
||||
* Class d3_oxwarticledetails_contenttabs
|
||||
*/
|
||||
use D3\Contenttabs\Application\Model\contentTabs as TabsModel;
|
||||
use OxidEsales\Eshop\Application\Model\Article;
|
||||
|
||||
class d3_oxwarticledetails_contenttabs extends d3_oxwarticledetails_contenttabs_parent
|
||||
{
|
||||
|
||||
/**
|
||||
* @return array|null
|
||||
*/
|
||||
public function d3GetTabs()
|
||||
{
|
||||
/**
|
||||
* @var Article
|
||||
*/
|
||||
$oArticle = $this->getProduct();
|
||||
|
||||
return oxNew(TabsModel::class, $oArticle)->getTabs();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* This Software is the property of Data Development and is protected
|
||||
* by copyright law - it is NOT Freeware.
|
||||
*
|
||||
* Any unauthorized use of this software without a valid license
|
||||
* is a violation of the license agreement and will be prosecuted by
|
||||
* civil and criminal law.
|
||||
*
|
||||
* http://www.shopmodule.com
|
||||
*
|
||||
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
||||
* @author D3 Data Development - Daniel Seifert <support@shopmodule.com>
|
||||
* @link http://www.oxidmodule.com
|
||||
*/
|
||||
|
||||
namespace D3\Contenttabs\Modules\Application\Model;
|
||||
|
||||
use D3\Contenttabs\Application\Model\contentTabs as TabsModel;
|
||||
|
||||
/**
|
||||
* Article manager.
|
||||
* Creates fully detailed article object, with such information as VAT,
|
||||
* discounts, etc.
|
||||
*
|
||||
*/
|
||||
class d3_oxarticle_longtexts extends d3_oxarticle_longtexts_parent
|
||||
{
|
||||
/**
|
||||
* Deletes record and other information related to this article such as images from DB,
|
||||
* also removes variants. Returns true if entry was deleted.
|
||||
*
|
||||
* @param string $sOXID Article id
|
||||
*
|
||||
* @throws \Exception
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function delete($sOXID = null)
|
||||
{
|
||||
if (!$sOXID) {
|
||||
$sOXID = $this->getId();
|
||||
}
|
||||
if (!$sOXID) {
|
||||
return parent::delete($sOXID);
|
||||
}
|
||||
|
||||
oxNew(TabsModel::class, $this)->deleteAllLongtexts($sOXID);
|
||||
|
||||
return parent::delete($sOXID);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue