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

Dev #344

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open

Dev #344

Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
2614874
[update] 新增stripe聚合支付方式,采用全新的paymentIntents API
linusxiong Jun 4, 2024
5cc0b77
Merge branch 'cedar2025:dev' into dev
linusxiong Jun 13, 2024
9270d94
Update StripeALLInOne.php
linusxiong Jun 13, 2024
fc283af
Update StripeALLInOne.php
linusxiong Jun 13, 2024
338aad7
Fix PaymentController.php
linusxiong Jun 13, 2024
0389edd
Merge branch 'cedar2025:dev' into dev
linusxiong Jun 14, 2024
bab7ed8
[fix] 修复catch的时候变量可能undefined的问题
linusxiong Jun 14, 2024
8cc247b
[feat] 新增telegram机器人/start指令
linusxiong Jun 14, 2024
f0c620c
[fix] 删除重复包导入
linusxiong Jun 17, 2024
acb40cc
[update] 新增credit card跳转至checkout页面付款
linusxiong Jul 2, 2024
b0fcc92
Merge branch 'cedar2025:dev' into dev
linusxiong Jul 19, 2024
60ed240
Update ClashMeta.php
yushum Aug 1, 2024
ab34ef3
Update SingBox.php
yushum Aug 1, 2024
4254272
Update Shadowrocket.php
yushum Aug 1, 2024
190e64b
Merge branch 'cedar2025:dev' into dev
linusxiong Sep 16, 2024
1d36069
Merge branch 'cedar2025:dev' into dev
linusxiong Oct 16, 2024
6cfdd1c
Update Surge.php
linusxiong Oct 18, 2024
e482b72
Merge branch 'cedar2025:dev' into dev
linusxiong Nov 14, 2024
ddac216
Update ClashMeta.php
longdoer Nov 19, 2024
1d9cb22
Merge branch 'cedar2025:dev' into dev
linusxiong Dec 2, 2024
c4595bc
use docker env on .env file
linusxiong Dec 8, 2024
1378fdb
fix bugs
linusxiong Dec 8, 2024
cfc8a05
fix bugs
linusxiong Dec 8, 2024
dee7525
Update Dockerfile
linusxiong Dec 8, 2024
22ffe0d
Update Dockerfile
linusxiong Dec 8, 2024
aa3ff5c
fix bug
linusxiong Dec 8, 2024
654f1f8
Update supervisord.conf
linusxiong Dec 8, 2024
d6b7ae6
Update default.sing-box.json
sechk777 Dec 19, 2024
256ca28
Merge branch 'cedar2025:dev' into dev
linusxiong Dec 31, 2024
9bc1d7a
Merge pull request #136 from linusxiong/dev
cedar2025 Jan 7, 2025
ae249f8
Update 1panel安装指南.md
cedar2025 Jan 7, 2025
cddcb14
Update 1panel安装指南.md
cedar2025 Jan 7, 2025
dde41da
update docker-compose安装指南.md
cedar2025 Jan 8, 2025
5b3474a
Revert "update docker-compose安装指南.md"
Jan 9, 2025
cf44a62
Revert "Update 1panel安装指南.md"
Jan 9, 2025
89d2aed
Revert "Update 1panel安装指南.md"
cedar2025 Jan 9, 2025
6aee3ea
Merge pull request #295 from sechk777/patch-1
cedar2025 Jan 10, 2025
a60b23b
Merge pull request #280 from longdoer/patch-1
cedar2025 Jan 10, 2025
e2262f1
feat: allow admin/staff unbind a user
elysias123 Jan 12, 2025
558834b
update docs
cedar2025 Jan 12, 2025
d57c3ca
Revert "update docs"
Jan 12, 2025
43bac89
Merge branch 'cedar2025:dev' into dev
elysias123 Jan 13, 2025
a550fd1
feat: Replace with a random string when the subscription domain conta…
elysias123 Jan 14, 2025
4d2b442
Update StripeALLInOne.php
linusxiong Jan 14, 2025
18c90a0
update docker-publish.yml
Jan 16, 2025
4877866
update docs
Jan 16, 2025
f6af731
update docs
Jan 16, 2025
ea6a2d8
Merge pull request #317 from linusxiong/patch-1
cedar2025 Jan 16, 2025
d3bc8ff
Merge pull request #192 from yushum/patch-1
cedar2025 Jan 16, 2025
024a9df
fix update.sh
rebecca554owen Jan 16, 2025
d743296
Merge pull request #325 from rebecca554owen/patch-1
cedar2025 Jan 16, 2025
74d9369
Merge pull request #313 from elysias123/dev
cedar2025 Jan 17, 2025
3a05281
Update MigrateFromV2b.php
cedar2025 Jan 18, 2025
dff2e72
Update docker-publish.yml
cedar2025 Jan 21, 2025
7acae3d
Update docker-publish.yml
cedar2025 Jan 21, 2025
6c67cbf
update docs
Jan 22, 2025
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
Prev Previous commit
Next Next commit
Update StripeALLInOne.php
修复部分报错语句不规范
  • Loading branch information
linusxiong authored Jun 13, 2024
commit 9270d94668ac9146ee9e26e0a2abd817c768d2d7
4 changes: 2 additions & 2 deletions app/Payments/StripeALLInOne.php
Original file line number Diff line number Diff line change
@@ -102,15 +102,15 @@ public function pay($order)
$jumpUrl = $nextAction['alipay_handle_redirect']['url'];
$actionType = 1;
}else {
throw new ApiException('unable get alipay redirect url', 500);
throw new ApiException('unable get Alipay redirect url', 500);
}
break;
case "wechat_pay":
if (isset($nextAction['wechat_pay_display_qr_code'])){
$jumpUrl = $nextAction['wechat_pay_display_qr_code']['data'];
Log::info($jumpUrl);
}else {
throw new ApiException('unable get alipay redirect url', 500);
throw new ApiException('unable get WeChat Pay redirect url', 500);
}
}
return [