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.

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

Release 2.1.0 #22

Merged
merged 50 commits into from
Apr 8, 2022
Merged
Show file tree
Hide file tree
Changes from 48 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
b380372
Add Pull Request template for github
matks Mar 30, 2020
2611032
Merge pull request #10 from matks/dev
PierreRambaud Mar 31, 2020
9b8fda0
Enable Release Drafter
matks Apr 1, 2020
31b5ea0
Merge pull request #11 from matks/dev
Progi1984 Apr 2, 2020
a93fce8
Add CONTRIBUTORS file
matks Jun 5, 2020
a68ecb8
Merge pull request #12 from matks/dev
Progi1984 Jun 8, 2020
f81d023
Update license header file index.php
matks Jun 9, 2020
70edfba
Update license header file statssales.php
matks Jun 9, 2020
e06dcf2
Update license header file translations/index.php
matks Jun 9, 2020
7be1260
Merge pull request #13 from matks/dev
PierreRambaud Jun 9, 2020
77b02f5
Add dependabot config file
Jul 20, 2020
f331192
Merge pull request #14 from PierreRambaud/dev
matks Jul 20, 2020
2bdb2d6
Update license header file index.php
matks Jul 22, 2020
21c8d75
Update license header file statssales.php
matks Jul 22, 2020
6425ece
Update license header file translations/index.php
matks Jul 22, 2020
5fb2f47
Merge pull request #15 from matks/fix-license-headers-2
matks Jul 22, 2020
63ede2d
Update About section of README
Julievrz Oct 29, 2020
844c9d4
Update short description
Julievrz Oct 29, 2020
8d71d8e
Update logo
Julievrz Oct 29, 2020
021c98f
Merge pull request #16 from Julievrz/dev
atomiix Oct 30, 2020
9ac563c
Use the good column for total turnover
Touxten Dec 24, 2020
9817038
Merge pull request #17 from okom3pom/okom3pom-fix-total
Progi1984 Jan 7, 2021
507b6a0
Remove deprecated functions
Hlavtox Oct 19, 2021
0eb653d
Merge pull request #19 from Hlavtox/remove-deprecated
PierreRambaud Oct 22, 2021
1d58fb8
Fixed Refunds in Total Sales Calculation
Progi1984 Oct 4, 2021
17b12ae
Fetch refunds only if available
Progi1984 Oct 27, 2021
f404ec4
Merge pull request #18 from Progi1984/issue16770
PierreRambaud Oct 27, 2021
6e7dd0c
Bump version to 2.1.0
Progi1984 Oct 27, 2021
16dee2e
Merge pull request #21 from Progi1984/bumpVersion
PierreRambaud Oct 27, 2021
138418a
Merge remote-tracking branch 'upstream/master' into mergeMaster
Progi1984 Oct 27, 2021
274cc30
Merge pull request #23 from Progi1984/mergeMaster
PierreRambaud Oct 27, 2021
68655ee
Remove duplicate in CONTRIBUTORS.md
PierreRambaud Oct 28, 2021
38cdc4d
Fixed error when there are no orders
Progi1984 Nov 3, 2021
b132aba
Merge pull request #24 from Progi1984/fixBugRelease
Progi1984 Nov 15, 2021
7cf2f11
Do not use hook AdminStatsModules alias, use displayAdminStatsModules
PrestaEdit Dec 29, 2021
93ae2f0
Merge pull request #26 from prestamodule/dev
PierreRambaud Dec 29, 2021
779a331
build release github action
jf-viguier Jan 5, 2022
fc3a373
Update build release to latest
jf-viguier Jan 5, 2022
6727415
Merge pull request #27 from jf-viguier/buildRelease
Progi1984 Jan 6, 2022
7eb9800
Set tab property
PrestaEdit Jan 14, 2022
62e0926
Merge pull request #28 from PrestaEdit/patch-1
matthieu-rolland Jan 14, 2022
2db5964
Renamed Readme.md in README.md
Progi1984 Feb 4, 2022
1057b8e
Improved composer dependencies
Progi1984 Feb 4, 2022
eaeac61
Added .gitignore
Progi1984 Feb 4, 2022
8d7237b
Added Github Action PHP
Progi1984 Feb 4, 2022
25ce9fd
Fixed PHPCSFixer
Progi1984 Feb 4, 2022
ff75332
Fixed PHPStan
Progi1984 Feb 4, 2022
99996c3
Merge pull request #29 from Progi1984/issue25921
PierreRambaud Feb 7, 2022
22c2008
Fixed calculation in SQL query if there are no refunds
Progi1984 Nov 26, 2021
a663471
Merge pull request #25 from Progi1984/fixCalculation
kpodemski Apr 5, 2022
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
19 changes: 19 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!-----------------------------------------------------------------------------
Thank you for contributing to the PrestaShop project!

Please take the time to edit the "Answers" rows below with the necessary information.

Check out our contribution guidelines to find out how to complete it:
https://devdocs.prestashop.com/1.7/contribute/contribution-guidelines/#pull-requests
------------------------------------------------------------------------------>

| Questions | Answers
| ------------- | -------------------------------------------------------
| Description? | Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table.
| Type? | bug fix / improvement / new feature / refacto / critical
| BC breaks? | yes / no
| Deprecations? | yes / no
| Fixed ticket? | Fixes PrestaShop/Prestashop#{issue number here}.
| How to test? | Please indicate how to best verify that this PR is correct.

<!-- Click the form's "Preview" button to make sure the table is functional in GitHub. Thank you! -->
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
target-branch: dev
- package-ecosystem: composer
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
target-branch: dev
14 changes: 14 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
branches:
- master
name-template: v$NEXT_PATCH_VERSION
tag-template: v$NEXT_PATCH_VERSION
categories:
- title: 🚀 Improvements
label: enhancement
- title: 🐛 Bug Fixes
label: bug
change-template: '- #$NUMBER: $TITLE by @$AUTHOR'
template: |
# Changes

$CHANGES
62 changes: 62 additions & 0 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: Build
on: [push, pull_request]

jobs:
deploy:
name: build dependencies & create artifact
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.0.0
- name: Install composer dependencies
run: composer install --no-dev -o
- name: Clean-up project
uses: PrestaShopCorp/github-action-clean-before-deploy@v1.0
- name: Prepare auto-index tool
run: |
composer global require prestashop/autoindex
- name: Generate index.php
run: |
~/.composer/vendor/bin/autoindex
- name: Create & upload artifact
uses: actions/upload-artifact@v1
with:
name: ${{ github.event.repository.name }}
path: ../
update_release_draft:
runs-on: ubuntu-latest
needs: [deploy]
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
steps:
- name: Download artifact
uses: actions/download-artifact@v1
with:
name: ${{ github.event.repository.name }}
- id: release_info
uses: toolmantim/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Prepare for Release
run: |
cd ${{ github.event.repository.name }}
zip -r ${{ github.event.repository.name }}.zip ${{ github.event.repository.name }}
- name: Clean existing assets
shell: bash
run: |
curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1
assets=`bin/hub api -t repos/${{ github.repository }}/releases/${{ steps.release_info.outputs.id }}/assets | awk '/\].url/ { print $2 }'`
for asset in $assets
do
bin/hub api -X DELETE $asset
done
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Publish to GitHub Release
uses: actions/upload-release-asset@v1.0.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.release_info.outputs.upload_url }}
asset_path: ./${{ github.event.repository.name }}/${{ github.event.repository.name }}.zip
asset_name: ${{ github.event.repository.name }}.zip
asset_content_type: application/zip
90 changes: 90 additions & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
---
name: PHP tests
on: [push, pull_request]
jobs:
# Check there is no syntax errors in the project
php-linter:
name: PHP Syntax check 5.6 => 8.1
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.0.0

- name: PHP syntax checker 5.6
uses: prestashop/github-action-php-lint/5.6@master

- name: PHP syntax checker 7.2
uses: prestashop/github-action-php-lint/7.2@master

- name: PHP syntax checker 7.3
uses: prestashop/github-action-php-lint/7.3@master

- name: PHP syntax checker 7.4
uses: prestashop/github-action-php-lint/7.4@master

- name: PHP syntax checker 8.0
uses: prestashop/github-action-php-lint/8.0@master

- name: PHP syntax checker 8.1
uses: prestashop/github-action-php-lint/8.1@master

# Check the PHP code follow the coding standards
php-cs-fixer:
name: PHP-CS-Fixer
runs-on: ubuntu-latest
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'

- name: Checkout
uses: actions/checkout@v2.0.0

- name: Cache dependencies
uses: actions/cache@v2
with:
path: vendor
key: php-${{ hashFiles('composer.lock') }}

- name: Install dependencies
run: composer install

- name: Run PHP-CS-Fixer
run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --using-cache=no --diff-format udiff

# Run PHPStan against the module and a PrestaShop release
phpstan:
name: PHPStan
runs-on: ubuntu-latest
strategy:
matrix:
presta-versions: ['1.7.6', '1.7.7', '1.7.8', 'latest']
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'

- name: Checkout
uses: actions/checkout@v2.0.0

# Add vendor folder in cache to make next builds faster
- name: Cache vendor folder
uses: actions/cache@v1
with:
path: vendor
key: php-${{ hashFiles('composer.lock') }}

# Add composer local folder in cache to make next builds faster
- name: Cache composer folder
uses: actions/cache@v1
with:
path: ~/.composer/cache
key: php-composer-cache

- run: composer install

# Docker images prestashop/prestashop may be used, even if the shop remains uninstalled
- name: Execute PHPStan on PrestaShop (Tag ${{ matrix.presta-versions }})
run: ./tests/phpstan.sh ${{ matrix.presta-versions }}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/config_*
/node_modules
/vendor
/.php_cs.cache
11 changes: 11 additions & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

$config = new PrestaShop\CodingStandards\CsFixer\Config();

$config
->setUsingCache(true)
->getFinder()
->in(__DIR__)
->exclude('vendor');

return $config;
15 changes: 15 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
GitHub contributors:
--------------------------------
- AlexEven
- Francois Gaillard
- Gregory Roussac
- Jérôme Nadaud
- Maxime Biloé
- Quetzacoalt91
- antoin-m
- eternoendless
- gaillafr
- maximebiloe
- sfroment
- tchauviere
- xBorderie
2 changes: 1 addition & 1 deletion Readme.md → README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## About

Adds graphics presenting the evolution of sales and orders to the Stats dashboard.
Enrich your stats, add graphics presenting the evolution of your sales and orders.

## Reporting issues

Expand Down
8 changes: 7 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,14 @@
"require": {
"php": ">=5.4"
},
"require-dev": {
"prestashop/php-dev-tools": "^3.4"
},
"config": {
"preferred-install": "dist"
"preferred-install": "dist",
"classmap-authoritative": true,
"optimize-autoloader": true,
"prepend-autoloader": false
},
"type": "prestashop-module"
}
Loading