Commit Graph

172 Commits

Author SHA1 Message Date
2fdb3ce74a app/Http/Controllers/RegularContractCreateController.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 25s
2025-10-09 16:03:04 +09:00
778b3ac9cc Merge pull request '新規契約減免区分修正' (#51) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 25s
Reviewed-on: #51
2025-10-09 15:55:53 +09:00
ae8315ba89 新規契約減免区分修正 2025-10-09 15:55:21 +09:00
fcf07cecc4 Merge pull request '契約履歴 表示条件修正' (#50) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 24s
Reviewed-on: #50
2025-10-09 10:23:37 +09:00
c602b214e4 契約履歴 表示条件修正 2025-10-09 10:22:51 +09:00
a085a47e04 app/Http/Controllers/RegularContractCreateController.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
2025-10-08 16:59:54 +09:00
195f130a46 Merge pull request 'ルート追加' (#49) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
Reviewed-on: #49
2025-10-08 16:56:23 +09:00
3c40565377 ルート追加 2025-10-08 16:55:48 +09:00
0a102e2a47 Merge pull request '契約期間選択修正' (#48) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
Reviewed-on: #48
2025-10-08 16:50:02 +09:00
a6637c9f72 契約期間選択修正 2025-10-08 16:49:40 +09:00
61b3283b58 Merge pull request '契約期間選択エラー処理修正' (#47) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 24s
Reviewed-on: #47
2025-10-08 16:35:52 +09:00
c1e95ce881 契約期間選択エラー処理修正 2025-10-08 16:35:28 +09:00
7e2a25d37b routes/web.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 25s
2025-10-08 16:18:06 +09:00
184860862b resources/views/regular_contract/create_select_period.blade.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 25s
2025-10-08 16:10:37 +09:00
57bae5bcf4 resources/views/regular_contract/create_select_period.blade.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
2025-10-08 15:55:57 +09:00
63efbb9481 Merge pull request '新規定期契約 定期契約期間選択修正' (#46) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 24s
Reviewed-on: #46
2025-10-08 15:38:13 +09:00
6aebe63251 新規定期契約 定期契約期間選択修正 2025-10-08 15:37:42 +09:00
f29ba66745 routes/web.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
2025-10-07 18:28:48 +09:00
ebd3a65096 Merge pull request '駐輪場検索修正' (#45) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
Reviewed-on: #45
2025-10-07 18:07:19 +09:00
89465021e4 駐輪場検索修正 2025-10-07 18:06:27 +09:00
5dff9d627a app/Http/Controllers/RegularContractCreateController.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
2025-10-07 17:36:50 +09:00
e13302475e Merge pull request '駐輪場検索 並び替え修正' (#44) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 24s
Reviewed-on: #44
2025-10-07 17:32:06 +09:00
8a9bd9d569 駐輪場検索 並び替え修正 2025-10-07 17:31:46 +09:00
ca283fc9a9 app/Http/Controllers/RegularContractCreateController.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
2025-10-07 17:07:42 +09:00
d84b0fb9e1 app/Http/Controllers/RegularContractCreateController.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
2025-10-07 16:54:59 +09:00
e80b0639ca resources/views/regular_contract/create.blade.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 26s
2025-10-07 16:46:29 +09:00
3cad3b3d0f Merge pull request '駐輪場検索画面 並び替え条件修正' (#43) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 25s
Reviewed-on: #43
2025-10-07 16:17:22 +09:00
a139353a2f 駐輪場検索画面 並び替え条件修正 2025-10-07 16:16:38 +09:00
29f40c37bb app/Http/Controllers/RegularContractCreateController.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
2025-10-07 15:56:39 +09:00
8d33e2bf78 app/Http/Controllers/RegularContractCreateController.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
2025-10-07 15:54:00 +09:00
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