-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #18 from yii2mod/revert-15-master
Revert "Stripe lib updated to 7, Stripe Checkout & webhook & some new attributes "
- Loading branch information
Showing
16 changed files
with
23 additions
and
4,401 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,6 @@ | |
| use yii\web\NotFoundHttpException; | ||
| use yii\web\Response; | ||
| use yii2mod\cashier\models\SubscriptionModel; | ||
| use yii\helpers\Url; | ||
|
|
||
| /** | ||
| * Class Billable | ||
|
|
@@ -33,93 +32,6 @@ trait Billable | |
| */ | ||
| protected static $stripeKey; | ||
|
|
||
| /** | ||
| * Mapping between attributes inside Stripe's metadata and a subscriptionModel attributes | ||
| * They will be updated by webhook controller , for example: 'metadata_id' => 'student_id' | ||
| * | ||
| * @return Array | ||
| */ | ||
| public static function billableMapMetadataAttributes() | ||
| { | ||
| return []; | ||
| } | ||
|
|
||
| /** | ||
| * Get the Stripe customer instance for the current user and token. | ||
| * (copied from SubscriptionBuilder) | ||
| * | ||
| * @return \Stripe\Customer | ||
| */ | ||
| public function getStripeCustomer($token=null) | ||
| { | ||
| if (!$this->stripe_id) { | ||
| $customer = $this->createAsStripeCustomer($token); | ||
| } else { | ||
| $customer = $this->asStripeCustomer(); | ||
| } | ||
|
|
||
| return $customer; | ||
| } | ||
|
|
||
| /** | ||
| * Make a "one off" charge on the customer for the given amount. | ||
| * | ||
| * @param int $amount | ||
| * @param array $options | ||
| * | ||
| * @return \Stripe\Checkout\Session | ||
| * | ||
| * @throws Card | ||
| */ | ||
| public function createCheckoutSessionForSubscription($planID, array $optionsParam = []): \Stripe\Checkout\Session | ||
| { | ||
| $customer = $this->getStripeCustomer(); | ||
| if (!$this->stripe_id) { | ||
| throw new InvalidArgumentException('No stripe customer provided.'); | ||
| } | ||
|
|
||
| $controller_url_name = ''; | ||
| if(array_key_exists('controller_url_name', $optionsParam)){ | ||
| $controller_url_name = $optionsParam['controller_url_name'] . '/'; | ||
| } | ||
| $url_base = Url::base(true); | ||
| if(array_key_exists('url_base', $optionsParam)){ | ||
| $url_base = $optionsParam['url_base'] . '/'; | ||
| } | ||
|
|
||
| $options = [ | ||
| 'customer' => $this->stripe_id, | ||
| 'payment_method_types' => ['card'], | ||
| 'subscription_data' => [ | ||
| 'items'=> [ | ||
| ['plan'=> $planID, 'quantity'=> 1] | ||
| ], | ||
| ], | ||
| 'success_url' => $url_base . $controller_url_name . 'success?session_id={CHECKOUT_SESSION_ID}', | ||
| 'cancel_url' => $url_base . $controller_url_name . 'cancel', | ||
| ]; | ||
|
|
||
| if(array_key_exists('success_url', $optionsParam)){ | ||
| $options['success_url'] = $optionsParam['success_url']; | ||
| } | ||
| if(array_key_exists('cancel_url', $optionsParam)){ | ||
| $options['cancel_url'] = $optionsParam['cancel_url']; | ||
| } | ||
| if(array_key_exists('client_reference_id', $optionsParam)){ | ||
| $options['client_reference_id'] = strval($optionsParam['client_reference_id']); | ||
| } | ||
| if(array_key_exists('metadata', $optionsParam)){ | ||
| $options['subscription_data']['metadata'] = $optionsParam['metadata']; | ||
| } | ||
|
|
||
| // if($this->email){ | ||
| // $options['customer_email'] = '[email protected]'; | ||
| // } | ||
|
|
||
| $session = \Stripe\Checkout\Session::create($options, ['api_key' => $this->getStripeKey()] ); | ||
| return $session; | ||
| } | ||
|
|
||
| /** | ||
| * Make a "one off" charge on the customer for the given amount. | ||
| * | ||
|
|
@@ -218,44 +130,6 @@ public function newSubscription(string $subscription, string $plan): Subscriptio | |
| return new SubscriptionBuilder($this, $subscription, $plan); | ||
| } | ||
|
|
||
| /** | ||
| * Create a new subscription from checkout params. | ||
| * | ||
| * @param array $payloadDataObject | ||
| * | ||
| * @return SubscriptionModel | ||
| */ | ||
| public function loadSubscriptionModel($subscriptionID, $clientReferenceId) | ||
| { | ||
| $subscriptionBuilder = new SubscriptionBuilder($this, '', ''); | ||
| return $subscriptionBuilder->loadSubscriptionModel($subscriptionID, $clientReferenceId); | ||
| } | ||
|
|
||
| /** | ||
| * Create a new subscription from checkout params. | ||
| * | ||
| * @param array $conditions https://stripe.com/docs/api/subscriptions/list | ||
| * | ||
| * @return Boolean | ||
| */ | ||
| public function updateSubscriptionModels($conditions = array()) | ||
| { | ||
| if (!$this->stripe_id) { | ||
| return false; | ||
| } | ||
|
|
||
| $conditions['customer'] = $this->stripe_id; | ||
| \Stripe\Stripe::setApiKey(Yii::$app->params['stripe']['apiKey']); | ||
| $stripeSubscriptions = \Stripe\Subscription::all($conditions) ; | ||
|
|
||
| foreach ($stripeSubscriptions as $stripeSubscription) { | ||
| $subscriptionBuilder = new SubscriptionBuilder($this, '', ''); | ||
| $subscriptionBuilder->updateSubscriptionModel($stripeSubscription, null); | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * Determine if the user is on trial. | ||
| * | ||
|
|
@@ -324,41 +198,6 @@ public function subscription(string $subscription = 'default'): ?SubscriptionMod | |
| return $this->getSubscriptions()->where(['name' => $subscription])->one(); | ||
| } | ||
|
|
||
| /** | ||
| * Get a subscription instance by conditions. | ||
| * | ||
| * @param array $conditions | ||
| * | ||
| * @return SubscriptionModel|null | ||
| */ | ||
| public function subscriptionByConditions($conditions): ?SubscriptionModel | ||
| { | ||
| return $this->getSubscriptions()->where($conditions)->one(); | ||
| } | ||
|
|
||
| /** | ||
| * Get a subscription instance by name. | ||
| * | ||
| * @param string $subscription | ||
| * | ||
| * @return SubscriptionModel|null | ||
| */ | ||
| public function subscriptionByStripeID(string $stripe_id = 'default'): ?SubscriptionModel | ||
| { | ||
| return $this->getSubscriptions()->where(['stripe_id' => $stripe_id])->one(); | ||
| } | ||
|
|
||
| /** | ||
| * Get a subscription instance by name. | ||
| * | ||
| * @param string $subscription | ||
| * | ||
| * @return SubscriptionModel|null | ||
| */ | ||
| public static function subscriptionOnlyByStripeID($stripe_id){ | ||
| return SubscriptionModel::find()->where(['stripe_id'=> $stripe_id])->one(); | ||
| } | ||
|
|
||
| /** | ||
| * @return mixed | ||
| */ | ||
|
|
@@ -462,10 +301,9 @@ public function invoices(bool $includePending = false, array $parameters = []): | |
| { | ||
| $invoices = []; | ||
|
|
||
| $parameters = array_merge(['limit' => 24, 'customer' => $this->stripe_id], $parameters); | ||
| $parameters = array_merge(['limit' => 24], $parameters); | ||
|
|
||
| \Stripe\Stripe::setApiKey(Yii::$app->params['stripe']['apiKey']); | ||
| $stripeInvoices = \Stripe\Invoice::all($parameters); | ||
| $stripeInvoices = $this->asStripeCustomer()->invoices($parameters); | ||
|
|
||
| // Here we will loop through the Stripe invoices and create our own custom Invoice | ||
| // instances that have more helper methods and are generally more convenient to | ||
|
|
@@ -632,12 +470,12 @@ public function hasStripeId(): bool | |
| /** | ||
| * Create a Stripe customer for the given user. | ||
| * | ||
| * @param string|null $token | ||
| * @param string $token | ||
| * @param array $options | ||
| * | ||
| * @return Customer | ||
| */ | ||
| public function createAsStripeCustomer($token = null, array $options = []): Customer | ||
| public function createAsStripeCustomer(string $token, array $options = []): Customer | ||
| { | ||
| $options = array_key_exists('email', $options) | ||
| ? $options : array_merge($options, ['email' => $this->email]); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.