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

Fix/do php #342

Merged
merged 4 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .do/deploy.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ spec:
git:
branch: master
repo_clone_url: https://github.com/jesusantguerrero/atmosphere.git
build_command: npm run build:digitalocean
run_command: php artisan migrate:fresh --force --seed ; php artisan storage:link; heroku-php-apache2 public/ && composer install --ignore-platform-reqs
build_command: npm run build:digitalocean; composer install --ignore-platform-reqs
run_command: php artisan migrate:fresh --force --seed ; php artisan storage:link; heroku-php-nginx public/
envs:
- key: APP_NAME
scope: RUN_TIME
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ FROM php:8.1.2-fpm
ARG user
ARG uid
ARG TZ

ENV user $user
ENV uid $uid
ENV TZ $TZ
# Install system dependencies
RUN apt-get update && apt-get install -y \
git \
Expand Down Expand Up @@ -36,3 +40,4 @@ RUN mkdir -p /home/$user/.composer && \
WORKDIR /var/www

USER $user
CMD ["php artisan serve"]
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

![example workflow](https://github.com/jesusantguerrero/atmosphere/actions/workflows/laravel.yml/badge.svg)

![example workflow](https://github.com/jesusantguerrero/atmosphere/actions/workflows/laravel.yml/badge.svg?event-push)


![image](https://user-images.githubusercontent.com/17421742/212417292-19f319c5-1cf4-48a8-ba40-1e9b040e820f.png)

Expand Down
4 changes: 4 additions & 0 deletions app/Domains/Budget/Services/BudgetRolloverService.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ private function setMonthBudget($category, $month) {
'name' => $month,
])->first();

if (!$budgetMonth) {
return;
}

if ($budgetMonth->category->account_id) {
$available = (- $budgetMonth->payments);
$available = Money::of($budgetMonth->funded_spending, $category->account->currency_code)
Expand Down
2 changes: 1 addition & 1 deletion app/Domains/Transaction/Services/TransactionService.php
Original file line number Diff line number Diff line change
Expand Up @@ -456,10 +456,10 @@ public function getCreditCardSpentTransactions(int $teamId) {
->orderByRaw('g.index,categories.index, accounts.index,accounts.number')
->where(fn ($q) => $q->where([
'transactions.status' => Transaction::STATUS_VERIFIED,
'accounts.team_id' => $teamId
])->orWhereNull('transactions.status')
)
->where([
'accounts.team_id' => $teamId,
'g.display_id' => 'liabilities',
])
->get();
Expand Down
13 changes: 11 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@
"description": "The Laravel Framework.",
"keywords": ["framework", "laravel"],
"license": "MIT",
"repositories": [
{
"url": "../packages/journal",
"type": "path",
"options": {
"symlink": true
}
}
],
"require": {
"php": "^8.1.0",
"php": "^8.1",
"ext-mailparse": "*",
"brick/money": "^0.6.0",
"doctrine/dbal": "^3.3",
Expand All @@ -28,7 +37,7 @@
"laravel/tinker": "^2.8",
"maatwebsite/excel": "^3.1",
"nwidart/laravel-modules": "^9.0",
"php-mime-mail-parser/php-mime-mail-parser": "^7.1",
"php-mime-mail-parser/php-mime-mail-parser": "^8.0",
"phpoffice/phpspreadsheet": "^1.27",
"rlanvin/php-rrule": "^2.4",
"simshaun/recurr": "^5.0",
Expand Down
Loading
Loading