Skip to content

Commit

Permalink
Merge branch '2.3.x' into dependabot/npm_and_yarn/jquery-3.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pierredup committed Jun 14, 2023
2 parents 41d862f + a45a3f0 commit 59f63dd
Show file tree
Hide file tree
Showing 12 changed files with 663 additions and 551 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/automatic-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: "actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab"
uses: "actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9"

- name: Setup PHP
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d
with:
php-version: 8.2
extensions: intl, gd, opcache, mysql, pdo_mysql, soap, zip, :xdebug
Expand All @@ -31,10 +31,10 @@ jobs:
node-version: 14

- name: Set up QEMU
uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18
uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c
uses: docker/setup-buildx-action@6a58db7e0d21ca03e6c44877909e80e45217eed2

- name: Release
uses: laminas/automatic-releases@12dde9b998d13e6721e5d000cf0c6a513ebdb98b
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout repository
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9

- name: Initialize CodeQL
uses: github/codeql-action/init@29b1f65c5e92e24fe6b6647da1eaabe529cec70f
uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@29b1f65c5e92e24fe6b6647da1eaabe529cec70f
uses: github/codeql-action/autobuild@cdcdbb579706841c47f7063dda365e292e5cad7a

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@29b1f65c5e92e24fe6b6647da1eaabe529cec70f
uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a

qodana:
permissions:
Expand All @@ -62,7 +62,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout repository
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9

- name: 'Qodana Scan'
uses: JetBrains/qodana-action@main
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9

- name: Setup PHP
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d
with:
php-version: 8.1
extensions: intl, gd, opcache, mysql, pdo_mysql
Expand Down Expand Up @@ -54,10 +54,10 @@ jobs:
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9

- name: Setup PHP
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d
with:
php-version: 8.1

Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout Code
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:
- uses: FranzDiebold/github-env-vars-action@5be1a823971b42aea2115f6d742484ab9a314bb6

- name: Checkout code
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
with:
path: solidinvoice

- name: Install PHP
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d
with:
coverage: none
extensions: curl, gd, intl, opcache, json, openssl, pdo, soap, xsl, :xdebug
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
- uses: symfonycorp/security-checker-action@258311ef7ac571f1310780ef3d79fc5abef642b5

8 changes: 4 additions & 4 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9

- name: Setup PHP
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d
with:
php-version: 8.1
ini-values: date.timezone=Europe/Paris, opcache.enable=1, opcache.enable_cli=1, opcache.memory_consumption=256, opcache.max_accelerated_files=32531, opcache.interned_strings_buffer=8, opcache.validate_timestamps=0, opcache.save_comments=1, opcache.fast_shutdown=0
Expand Down Expand Up @@ -60,11 +60,11 @@ jobs:
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9

- name: 'Qodana Scan'
uses: JetBrains/qodana-action@61b94e7e3a716dcb9e2030cfd79cd46149d56c26

- uses: github/codeql-action/upload-sarif@29b1f65c5e92e24fe6b6647da1eaabe529cec70f
- uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a
with:
sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
4 changes: 2 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9

- uses: haya14busa/action-cond@1d6e8a12b20cdb4f1954feef9aa475b9c390cab5
id: coverage_driver
Expand All @@ -61,7 +61,7 @@ jobs:
if_false: none

- name: Setup PHP
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d
with:
php-version: ${{ matrix.php }}
ini-values: date.timezone=Africa/Johannesburg, opcache.enable=1, opcache.enable_cli=1, opcache.memory_consumption=256, opcache.max_accelerated_files=32531, opcache.interned_strings_buffer=8, opcache.validate_timestamps=0, opcache.save_comments=1, opcache.fast_shutdown=0, memory_limit=-1
Expand Down
81 changes: 40 additions & 41 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,95 +6,94 @@
<br>
</p>

SolidInvoice is a simple open source invoicing application aimed to help small businesses and freelancers manage their day-to-day billing.
It's a feature rich elegant online application to ensure that you can always get paid on time.
SolidInvoice is a sophisticated open-source invoicing application designed to assist small businesses and freelancers in efficiently managing their daily billing operations. With its comprehensive range of features, this elegant online platform ensures that you receive timely payments.

## Features
## Key Features

* Clients and Contacts management
* Create and manage Quotes
* Create and manage Invoices
* Accept payments online
* Tax and discount handling
* RESTful API
* Receive Notifications either via text message, email or through HipChat
* More to come
- Robust clients and contacts management system
- Creation and management of quotes
- Generation and oversight of invoices
- Seamless online payment acceptance
- Effective handling of taxes and discounts
- RESTful API for integration with other systems
- Receive notifications through various channels, including text messages, emails, or HipChat
- Future enhancements planned

## Requirements
## System Requirements

PHP >= 8.1 is required. Use the latest version of PHP for best experience.
SolidInvoice requires PHP version 8.1 or later for optimal performance. It is recommended to use the latest available version of PHP.

## Installation
## Installation Options

### Docker

Docker makes it really easy to get started as quickly as possible in running SolidInvoice.

The docker image is available at [https://hub.docker.com/r/solidinvoice/solidinvoice/](https://hub.docker.com/r/solidinvoice/solidinvoice/) with instructions on how to get started.
Getting started with SolidInvoice is quick and simple using Docker. The Docker image can be found at [https://hub.docker.com/r/solidinvoice/solidinvoice/](https://hub.docker.com/r/solidinvoice/solidinvoice/), along with instructions on how to begin.

### Archived Package

Download the latest release from [https://github.com/SolidInvoice/SolidInvoice/releases](https://github.com/SolidInvoice/SolidInvoice/releases) in either `zip` or `tar.gz` format,
and extract the contents of the archive under your webserver directory.

### For developers
To install SolidInvoice from an archived package, download the latest release in either the `zip` or `tar.gz` format from [https://github.com/SolidInvoice/SolidInvoice/releases](https://github.com/SolidInvoice/SolidInvoice/releases). Extract the contents of the archive into the appropriate directory within your web server.

To install from source, you first need to clone the repository, then you need [composer][1] in order to install all the dependencies.
### Installation for Developers

To clone the repository, issue the following command. Remember to clone the repository to the path you want, that is accessible from your webserver.
If you prefer to install SolidInvoice from the source code, follow these steps:

1. Clone the repository by executing the following command:
```bash
git clone https://github.com/SolidInvoice/SolidInvoice.git
```
Ensure that you choose a destination path accessible from your web server.

Then go into the repository directory

2. Navigate to the cloned repository:
```bash
cd SolidInvoice
```

Now you need to get composer

3. Obtain Composer, a dependency management tool, by running:
```bash
curl -s http://getcomposer.org/installer | php
```

When composer is finished downloading, you can install the required dependencies:

4. Once Composer has finished downloading, install the required dependencies:
```bash
php composer.phar install
```


The final step is to install the Node packages, and compile all the assets

5. Install the necessary Node packages and compile all assets:
```bash
yarn install
yarn dev
```

Now you should have a fully working copy of SolidInvoice.
At this point, SolidInvoice should be fully functional.

If you want to run SolidInvoice in production mode, some additional steps is required:
For production environments, follow these additional steps:

1. Build the project and optimize it for production:
```bash
yarn build
```

## Contributing
2. Deploy the optimized version of SolidInvoice.

See [CONTRIBUTING](CONTRIBUTING.md)
## Contribution Guidelines

For information on contributing to the project, please refer to the [CONTRIBUTING](CONTRIBUTING.md) file.

## License

SolidInvoice is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
SolidInvoice is licensed under the MIT license, an open-source software license. For detailed information, please consult the [LICENSE](LICENSE) file.

## Sponsorship

Please see the [LICENSE](LICENSE) file for the full license.
We extend our gratitude to all the sponsors who support this project!

## Donate
<a class="btn" aria-label="Sponsor @SolidInvoice" href="/sponsors/SolidInvoice?o=esc">
<span>Sponsor @SolidInvoice</span>
</a>

Thank you for supporting the project!
### Thank you to the following sponsors:

[![Paypal](https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EQLK2P3VBW2LC)
* JetBrains (PHPStorm License)
* Docker (Docker Hub Subscription)

[1]: http://getcomposer.org
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"mpociot/vat-calculator": "^3.1",
"namshi/notificator": "^5.1",
"nesbot/carbon": "^2.28",
"pagerfanta/pagerfanta": "^3.7",
"pagerfanta/pagerfanta": "^4.1",
"payum/authorize-net-aim": "^1.7",
"payum/be2bill": "^1.7",
"payum/core": "^1.7",
Expand Down Expand Up @@ -74,13 +74,13 @@
"symfony/doctrine-bridge": "^5.4",
"symfony/dotenv": "^5.4",
"symfony/event-dispatcher": "^5.4",
"symfony/expression-language": "^5.4",
"symfony/expression-language": "^6.2",
"symfony/filesystem": "^5.4",
"symfony/finder": "^5.4",
"symfony/flex": "^1.19",
"symfony/form": "^5.4",
"symfony/framework-bundle": "^5.4",
"symfony/google-mailer": "^5.4",
"symfony/google-mailer": "^6.2",
"symfony/http-client": "^5.4",
"symfony/http-foundation": "^5.4",
"symfony/http-kernel": "^5.4",
Expand Down
Loading

0 comments on commit 59f63dd

Please sign in to comment.