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

Stripe billing and invoicing #180

Open
wants to merge 64 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
bd6b374
Removed old billing logic
bohdan-vorona Mar 29, 2023
85b4c2e
Removed old Stripe component
bohdan-vorona Mar 29, 2023
e031cb7
Stripe integration initial docs, pricing widget
bohdan-vorona Mar 31, 2023
c42dcc5
Stripe webhooks, updated docs, updated SubscriptionService, added cus…
bohdan-vorona Apr 1, 2023
43facce
Updated docs, updated webhooks, signature verification, added `checko…
bohdan-vorona Apr 3, 2023
4340254
Subscription history, removed old stripe values, updated BaseCustomer…
bohdan-vorona Apr 4, 2023
994d52d
Mock StripeCustomerSubscriptionDeletedJob, thank you page, invoice pa…
bohdan-vorona Apr 5, 2023
6cd77c5
Upgraded Stripe jobs
bohdan-vorona Apr 6, 2023
ba98136
SubscriptionService upgrade
bohdan-vorona Apr 6, 2023
7efd6c3
implemented StripeCustomerDeletedJob, implemented StripeCustomerSubsc…
bohdan-vorona Apr 6, 2023
9316c84
Table and class rename, mock StripeCustomerSubscriptionTrialWillEndJo…
bohdan-vorona Apr 7, 2023
bf62e55
Subscribed page upgrade
bohdan-vorona Apr 8, 2023
dd8ff0d
Fields change
bohdan-vorona Apr 8, 2023
0e321e2
Cron -> pastDueSubscriptions()
bohdan-vorona Apr 8, 2023
6b96ca1
Stripe webhooks errors serialization update
bohdan-vorona Apr 10, 2023
13783a9
StripeCustomerSubscriptionCreatedJob
bohdan-vorona Apr 10, 2023
9ed299c
Stripe draft invoice fix
bohdan-vorona Apr 10, 2023
1002fc5
Check user/customer subscription
bohdan-vorona Apr 10, 2023
a28dd6b
Removed unused webhooks
bohdan-vorona Apr 10, 2023
a9807a4
Updated docs
bohdan-vorona Apr 10, 2023
c7ac54a
Stripe qty usage
bohdan-vorona Apr 12, 2023
3b6a46b
Docs updated.
bohdan-vorona Apr 12, 2023
5e4bcce
Removed old billing logic
bohdan-vorona Mar 29, 2023
c8bce05
Removed old Stripe component
bohdan-vorona Mar 29, 2023
d28d89b
Stripe integration initial docs, pricing widget
bohdan-vorona Mar 31, 2023
a7b406f
Stripe webhooks, updated docs, updated SubscriptionService, added cus…
bohdan-vorona Apr 1, 2023
7e7b30d
Updated docs, updated webhooks, signature verification, added `checko…
bohdan-vorona Apr 3, 2023
3f00535
Subscription history, removed old stripe values, updated BaseCustomer…
bohdan-vorona Apr 4, 2023
a47cf90
Mock StripeCustomerSubscriptionDeletedJob, thank you page, invoice pa…
bohdan-vorona Apr 5, 2023
4df98f6
Upgraded Stripe jobs
bohdan-vorona Apr 6, 2023
9b1f653
SubscriptionService upgrade
bohdan-vorona Apr 6, 2023
18dc1d5
implemented StripeCustomerDeletedJob, implemented StripeCustomerSubsc…
bohdan-vorona Apr 6, 2023
5793b77
Table and class rename, mock StripeCustomerSubscriptionTrialWillEndJo…
bohdan-vorona Apr 7, 2023
b265afe
Subscribed page upgrade
bohdan-vorona Apr 8, 2023
4988688
Fields change
bohdan-vorona Apr 8, 2023
8103376
Cron -> pastDueSubscriptions()
bohdan-vorona Apr 8, 2023
3159812
Stripe webhooks errors serialization update
bohdan-vorona Apr 10, 2023
04964c2
StripeCustomerSubscriptionCreatedJob
bohdan-vorona Apr 10, 2023
9a52c2b
Stripe draft invoice fix
bohdan-vorona Apr 10, 2023
a3c79da
Check user/customer subscription
bohdan-vorona Apr 10, 2023
019b1e9
Removed unused webhooks
bohdan-vorona Apr 10, 2023
befb922
Updated docs
bohdan-vorona Apr 10, 2023
4765fff
Stripe qty usage
bohdan-vorona Apr 12, 2023
314b010
Docs updated.
bohdan-vorona Apr 12, 2023
f9da180
Merge branch 'feature/stripe-billing-and-invoicing' of https://github…
bohdan-vorona Apr 12, 2023
7e796e8
composer update
bohdan-vorona Apr 12, 2023
d9125e1
Update common/models/Subscription.php
bohdan-vorona Apr 14, 2023
49383d7
Update common/models/Subscription.php
bohdan-vorona Apr 14, 2023
589e3ad
Update common/models/Subscription.php
bohdan-vorona Apr 14, 2023
062f011
Update common/models/query/SubscriptionQuery.php
bohdan-vorona Apr 14, 2023
78afb0f
Update common/models/query/SubscriptionQuery.php
bohdan-vorona Apr 14, 2023
aac0fbb
Update common/models/query/SubscriptionQuery.php
bohdan-vorona Apr 14, 2023
e0015c6
Update console/jobs/subscription/stripe/StripeCustomerSubscriptionCre…
bohdan-vorona Apr 14, 2023
71dab96
Update common/models/query/SubscriptionQuery.php
bohdan-vorona Apr 14, 2023
8d11ca3
Update console/jobs/subscription/stripe/StripeCheckoutSessionComplete…
bohdan-vorona Apr 14, 2023
d721bb0
Update console/jobs/subscription/stripe/StripeCheckoutSessionComplete…
bohdan-vorona Apr 14, 2023
2c659b7
Update common/models/Subscription.php
bohdan-vorona Apr 14, 2023
4da968e
Changes
bohdan-vorona Apr 14, 2023
3a513fa
Merge branch 'feature/stripe-billing-and-invoicing' of https://github…
bohdan-vorona Apr 14, 2023
3f21a1c
Stripe component + some changes after testing
bohdan-vorona Apr 17, 2023
5c971b3
Stripe component small update
bohdan-vorona Apr 17, 2023
8227e4d
Stripe component update
bohdan-vorona Apr 17, 2023
e696a17
Stripe component revert back latest changes
bohdan-vorona Apr 18, 2023
d693ac0
update to make file
cgsmith Apr 20, 2023
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 common/models/query/SubscriptionQuery.php
Co-authored-by: Alexander Makarov <sam@rmcreative.ru>
  • Loading branch information
bohdan-vorona and samdark authored Apr 14, 2023
commit 71dab96a057f36794b7fba7f8d5f5454e836c9e5
2 changes: 1 addition & 1 deletion common/models/query/SubscriptionQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function isTrial(): SubscriptionQuery

public function isNotTrial(): SubscriptionQuery
{
return $this->andOnCondition(['is_trial' => Subscription::IS_FALSE]);
return $this->andOnCondition(['is_trial' => 0]);
}

public function isNotSynced(): SubscriptionQuery
Expand Down