Skip to content

Commit

Permalink
Merge pull request #13 from OXIDprojects/Oxid6.2.x
Browse files Browse the repository at this point in the history
Backwards compatibility for shop version 6.1.x and 6.1.x
  • Loading branch information
keywan-ghadami-oxid authored Nov 2, 2020
2 parents 2d035e7 + c173d27 commit e2edb6b
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 40 deletions.
2 changes: 1 addition & 1 deletion Controller/Admin/hdiReport.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class hdiReport extends AdminController
{
//Definition der ZEntralen Daten
//TemplateFile
protected const MODULE_ID = 'module:hdiReport';
const MODULE_ID = 'module:hdiReport';
protected $_sThisTemplate = "hdireport_main.tpl";
public $_sChart = '';
protected $_oOrderList = null;
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Originally registered: 2011-12-08 by Rafael Dabrowski on former OXIDforge.

OXID eShop Version:

- **OXID eShop 6.0 - 6.1**
- **OXID eShop 6.0 - 6.2**

- OXID eShop 4 Download: [Link](../../tree/b-0.9.x)

Expand All @@ -26,8 +26,10 @@ Changelog:
v0.9.3: Added metadata.php to use the extension in OXID > 4.5
v0.9.4: Changed structure for use in OXID > 4.7
v0.9.5: Moved all files to module-folder for use in OXID > 4.7
v0.9.6: Compaiblity to 4.9
v0.9.6: Compatibility to 4.9
v2.0.x: OXID 6 Module by eComStyle.de
v2.0.3: Compatibility to 6.2
v2.0.4: Backwards Compatibility to 6.1 and 6.0

Licensing:

Expand Down
4 changes: 2 additions & 2 deletions metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
* 23.09.2019 - Josef A. Puckl | eComStyle.de - Moduleinstellung: Bestellordner nicht auswerten.
*/

$sMetadataVersion = '2.0';
$sMetadataVersion = '2.1';
$aModule = [
'id' => 'hdiReport',
'title' => 'HDI Report',
'description' => 'Module for sale statistics.',
'version' => '2.0.3',
'version' => '2.0.4',
'author' => 'Rafael Dabrowski | HEINER DIRECT GmbH & Co KG',
'url' => 'http://www.heiner-direct.com',
'email' => '[email protected]',
Expand Down
7 changes: 5 additions & 2 deletions src/hdiReport.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 27 additions & 27 deletions src/hdiReport.min.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions views/admin/de/hdiReport_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
'HDIREPORT_FTHISYEAR' => "dieses Jahr",
'HDIREPORT_FLASTYEAR' => "letztes Jahr",
'HDIREPORT_FALL' => "Alle",
'HDIREPORT_FBYPRODUCT' => "Nach Product: <small>Artikelnummer;Artikelnummer</small>",
'HDIREPORT_FMINREVENUE' => "Mindest Umsatz:",
'HDIREPORT_FBYPRODUCT' => "Nach Produkt: <small>Artikelnummer;Artikelnummer</small>",
'HDIREPORT_FMINREVENUE' => "Mindestumsatz:",
'HDIREPORT_FMAXREVENUE' => "Maximaler Umsatz:",
'HDIREPORT_FLIMIT' => "Ausgabe begrenzen auf:",
'HDIREPORT_SAVE' => "[+] Ansicht als Favorit speichern",
Expand All @@ -52,9 +52,9 @@
'HDIREPORT_PRODUCT' => "Produkt",
'HDIREPORT_MARKETING' => "Marketingcode",
'HDIREPORT_NOTFILTER' => "nicht filtern",
'HDIREPORT_NODATA' => "Keine Daten Gefunden",
'HDIREPORT_SAVED' => "OK gespeichert",
'HDIREPORT_SAVEDERR' => "Fehler bitte nochmal probieren",
'HDIREPORT_NODATA' => "Keine Daten gefunden",
'HDIREPORT_SAVED' => "Erfolgreich gespeichert",
'HDIREPORT_SAVEDERR' => "Fehler, bitte nochmal probieren",
'HDIREPORT_ASC' => "Aufsteigend?",
'HDIREPORT_MONTHVALUES' => '["Januar","Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"]',
'HDIREPORT_MONTHVALUESSHORT' => '["Jan","Feb","Mrz","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"]',
Expand Down
2 changes: 1 addition & 1 deletion views/admin/en/hdiReport_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
'HDIREPORT_MARKETING' => "Marketingcode",
'HDIREPORT_NOTFILTER' => "do not filter",
'HDIREPORT_NODATA' => "No data found",
'HDIREPORT_SAVED' => "OK saved",
'HDIREPORT_SAVED' => "Succesfully saved",
'HDIREPORT_SAVEDERR' => "Error please try again",
'HDIREPORT_ASC' => "Ascending?",
'HDIREPORT_MONTHVALUES' => "['January','February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']",
Expand Down

0 comments on commit e2edb6b

Please sign in to comment.