Skip to content

Commit

Permalink
v1.1
Browse files Browse the repository at this point in the history
* New entity: RepertoryEntry related to Order with many to one. Only certified orders can have it's Entryies. * Entryies describe order with additional fields.
* Additional field in Order entity: additional fee.
* New search Order by id functionality.
* Current subject type and id are now included in url.
* New share subject functionality (via url with typa and id).
* Content of warnings is now avialable on icon hover.
* Archves tab was removed: deleted and settled orders are now in Orders tab (via filters).
* Browser history integration: move back / forward updates current subject without page reload.
* New functionality in Invoices tab: orders can be updated directly from there.
  • Loading branch information
sigere authored May 13, 2022
1 parent 39659a8 commit 257f708
Show file tree
Hide file tree
Showing 157 changed files with 8,434 additions and 6,017 deletions.
6 changes: 3 additions & 3 deletions .docker/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN apt update \

WORKDIR /var/www/OrderManager

RUN usermod -u 1000 www-data

RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

RUN curl -sS https://get.symfony.com/cli/installer | bash
RUN mv /root/.symfony/bin/symfony /usr/local/bin/symfony
RUN git config --global user.email "a.marczak1324@gmail.com" \
&& git config --global user.name "siger"
RUN mv /root/.symfony/bin/symfony /usr/local/bin/symfony
29 changes: 29 additions & 0 deletions .github/workflows/jscs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: JS lint

on: pull_request

jobs:
run-linters:
name: Run linters
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v1
with:
node-version: 12

- name: Create config
run: |
touch ./package.json
echo '{"devDependencies": {"eslint": "^8.0.0"}}' > ./package.json
touch ./.eslintrc
echo '{"rules": {"semi": ["error", "always"],"quotes": ["error", "double"]}}' > ./.eslintrc
- name: Install Node.js dependencies
run: npm install eslint

- name: Run linters
run: ./node_modules/.bin/eslint ./public/js -c ./dev/eslint/.eslintrc.json --ignore-path ./dev/eslint/.eslintignore
9 changes: 0 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,5 @@
/vendor/
###< symfony/framework-bundle ###

###> friendsofphp/php-cs-fixer ###
/.php-cs-fixer.php
/.php-cs-fixer.cache
/.php-cs-fixer.dist.php
###< friendsofphp/php-cs-fixer ###

.idea
src/Controller/FixController.php
=======
###< friendsofphp/php-cs-fixer ###

41 changes: 21 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,29 @@
"doctrine/orm": "^2.8",
"sensio/framework-extra-bundle": "^5.6",
"shuchkin/simplexlsxgen": "^1.0",
"symfony/asset": "5.2.*",
"symfony/console": "5.2.*",
"symfony/dotenv": "5.2.*",
"symfony/flex": "^1.3.1",
"symfony/form": "5.2.*",
"symfony/framework-bundle": "5.2.*",
"symfony/intl": "5.2.*",
"symfony/maker-bundle": "^1.27",
"symfony/asset": "5.4.*",
"symfony/console": "5.4.*",
"symfony/dotenv": "5.4.*",
"symfony/form": "5.4.*",
"symfony/framework-bundle": "5.4.*",
"symfony/http-client": "5.4.*",
"symfony/intl": "5.4.*",
"symfony/monolog-bundle": "^3.0",
"symfony/proxy-manager-bridge": "5.2.*",
"symfony/security-bundle": "5.2.*",
"symfony/stopwatch": "5.2.*",
"symfony/twig-bundle": "5.2.*",
"symfony/validator": "5.2.*",
"symfony/var-dumper": "5.2.*",
"symfony/web-profiler-bundle": "5.2.*",
"symfony/yaml": "5.2.*"
"symfony/proxy-manager-bridge": "5.4.*",
"symfony/security-bundle": "5.4.*",
"symfony/stopwatch": "5.4.*",
"symfony/translation": "5.4.*",
"symfony/twig-bundle": "5.4.*",
"symfony/validator": "5.4.*",
"symfony/yaml": "5.4.*"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.0",
"squizlabs/php_codesniffer": "*",
"symfony/debug-bundle": "5.2.*"
"squizlabs/php_codesniffer": "^3.6",
"symfony/debug-bundle": "5.4.*",
"symfony/flex": "^v1.18.3",
"symfony/maker-bundle": "^v1.36.4",
"symfony/var-dumper": "5.4.*",
"symfony/web-profiler-bundle": "5.4.*"
},
"config": {
"optimize-autoloader": true,
Expand Down Expand Up @@ -84,7 +85,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "5.2.*"
"require": "5.4.*"
}
}
}
Loading

0 comments on commit 257f708

Please sign in to comment.