Commit Graph

142 Commits

Author SHA1 Message Date
57efa7f63e app/Http/Controllers/RegularContractCreateController.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 24s
2025-10-07 15:49:14 +09:00
9d9717863e app/Http/Controllers/RegularContractCreateController.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 24s
2025-10-07 15:32:25 +09:00
f22f447a86 Merge pull request '駐輪場検索画面 並び替え条件修正' (#42) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 27s
Reviewed-on: #42
2025-10-07 15:27:46 +09:00
0afe05606e 駐輪場検索画面 並び替え条件修正 2025-10-07 15:27:12 +09:00
dfa786ca6f Merge pull request '駐輪場ポップアップ ボタンサイズ調整' (#41) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 25s
Reviewed-on: #41
2025-10-06 16:30:01 +09:00
e25df2dd27 駐輪場ポップアップ ボタンサイズ調整 2025-10-06 16:29:21 +09:00
Your Name
253e388058 shj3 修正
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
2025-10-05 01:50:06 +09:00
Your Name
ff21ee5796 Merge branch 'main' of https://git.so-manager-dev.com/so-manager/so-manager-dev.com
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 24s
2025-10-03 20:32:33 +09:00
Your Name
9441a34f6f SHJ-9/SHJ-10: 修复定期契約集計処理の統合ロジック
- 定期契約データを psectionusertypemonths で統合
- 新規/更新  減免/通常 を1レコードに集約
- Operator Queue に park_id と operator_id を正確に設定
- SQL に contract_money の SUM を追加
2025-10-03 20:32:09 +09:00
56c7ae8778 Merge pull request 'main_watanabe' (#40) from main_watanabe into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 24s
Deploy preview (main_watanabe) / deploy (push) Successful in 19s
Reviewed-on: #40
2025-10-03 17:47:10 +09:00
b4532dd76c 10/3 マージ
All checks were successful
Deploy preview (main_watanabe) / deploy (push) Successful in 12s
2025-10-03 17:46:11 +09:00
7b2d8c4416 Merge pull request '契約更新画面修正' (#39) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 24s
Reviewed-on: #39
2025-10-03 15:30:09 +09:00
1ecaf6d46a 契約更新画面修正 2025-10-03 15:29:41 +09:00
23327a4ca3 resources/views/regular_contract/update.blade.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 22s
2025-10-02 17:21:01 +09:00
a34046b72a Merge pull request 'ファビコン設定' (#38) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
Reviewed-on: #38
2025-10-02 16:44:33 +09:00
467ae8d055 ファビコン設定 2025-10-02 16:44:09 +09:00
d2b631bbab Merge pull request '駐輪場空き台数計算処理修正' (#37) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
Reviewed-on: #37
2025-10-02 16:29:09 +09:00
8dc41b211c 駐輪場空き台数計算処理修正 2025-10-02 16:28:17 +09:00
56ea54ab15 Merge pull request 'mpdfインストール' (#36) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 27s
Reviewed-on: #36
2025-10-01 18:35:04 +09:00
609faf58a4 mpdfインストール 2025-10-01 18:34:26 +09:00
b18f4762bb Merge pull request 'シール再発行修正' (#35) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 21s
Reviewed-on: #35
2025-10-01 16:47:41 +09:00
f389f1482a シール再発行修正 2025-10-01 16:47:13 +09:00
4f4a914b7d Merge pull request 'シール再発行、タグ再発行機能追加' (#34) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 21s
Reviewed-on: #34
2025-10-01 13:04:26 +09:00
d677aa232d シール再発行、タグ再発行機能追加 2025-09-30 13:45:36 +09:00
70a0919746 Merge pull request 'お知らせ画面修正' (#33) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 20s
Reviewed-on: #33
2025-09-29 15:50:53 +09:00
ecc7095818 お知らせ画面修正 2025-09-29 15:50:17 +09:00
d1306131cf Merge remote-tracking branch 'origin/main' into main_watanabe
All checks were successful
Deploy preview (main_watanabe) / deploy (push) Successful in 14s
2025-09-29 11:44:02 +09:00
5a7721b217 Merge pull request 'フッターメニュー修正' (#32) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 22s
Reviewed-on: #32
2025-09-26 20:12:42 +09:00
facc01dca6 フッターメニュー修正 2025-09-26 20:12:19 +09:00
3c0406727b Merge pull request 'composer関連更新' (#31) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 21s
Reviewed-on: #31
2025-09-26 20:09:30 +09:00
926562d135 composer関連更新 2025-09-26 20:08:22 +09:00
bf7e6c901a composer.lock を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 22s
2025-09-26 19:46:33 +09:00
b2b359028b composer.json を更新
Some checks failed
Deploy so-manager (auto) / deploy (push) Failing after 3s
2025-09-26 19:18:58 +09:00
86af1df345 composer.json を更新
Some checks failed
Deploy so-manager (auto) / deploy (push) Failing after 4s
2025-09-26 19:10:28 +09:00
831b25ae8b Merge pull request '会員へのお知らせ追加' (#30) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 22s
Reviewed-on: #30
2025-09-26 18:33:47 +09:00
b6bbb605dd 会員へのお知らせ追加 2025-09-26 18:33:19 +09:00
79fd7f2ca3 Merge remote-tracking branch 'origin/main' into main_watanabe
All checks were successful
Deploy preview (main_watanabe) / deploy (push) Successful in 11s
2025-09-26 17:28:37 +09:00
0e67f5a11b Merge remote-tracking branch 'origin/main' into main_watanabe 2025-09-26 17:28:18 +09:00
e70c834bb0 Merge pull request '9/26 マージ' (#29) from main_watanabe into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 20s
Reviewed-on: #29
2025-09-26 17:27:54 +09:00
eed5d85741 9/26 マージ
All checks were successful
Deploy preview (main_watanabe) / deploy (push) Successful in 13s
2025-09-26 17:27:15 +09:00
Your Name
3960e062b9 SHJ-5駐輪場空きチェック
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 21s
SHJ-13契約台数追加
2025-09-26 17:03:01 +09:00
bbc7ae7e83 Merge pull request 'マイページお知らせ修正' (#28) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 21s
Reviewed-on: #28
2025-09-25 14:12:03 +09:00
dce7e1daad マイページお知らせ修正 2025-09-25 14:11:35 +09:00
41cd07db41 routes/web.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 21s
2025-09-24 16:57:27 +09:00
01c1f74d09 routes/web.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 21s
2025-09-24 16:55:46 +09:00
ef056d1255 Merge pull request 'マイページ追加' (#27) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 21s
Reviewed-on: #27
2025-09-24 16:53:54 +09:00
814b85cdbb public/assets/css/mypage/all.css を削除 2025-09-24 16:53:22 +09:00
3337d6abac マイページ追加 2025-09-24 16:52:21 +09:00
52f568c5f4 app/Http/Controllers/RegularContractCreateController.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 20s
Deploy preview (main_watanabe) / deploy (push) Successful in 14s
2025-09-22 12:21:59 +09:00
3964a85578 Merge pull request '新規定期契約 先祖返り部分修正' (#26) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 20s
Reviewed-on: #26
2025-09-22 12:10:50 +09:00