Merge pull request #291 from enupal/develop

Develop

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Stripe Payments Changelog
 
+## 5.0.2 - 2022.06.02
+### Added
+- Added the `craft.enupalStripe.app` service layer to twig variable ([#289])
+- Added the `Stripe Prices` field type ([#288])
+
+[#288]: https://github.com/enupal/stripe/issues/288
+[#289]: https://github.com/enupal/stripe/issues/289
+
 ## 5.0.1 - 2022.05.28
 ### Fixed
 - Fixed issue when creating a Stripe Products field type

composer.json

@@ -2,7 +2,7 @@
   "name": "enupal/stripe",
   "description": "Allows customers # for recurring and one-time payments with Stripe, perfect for orders, donations, subscriptions, and events. Create simple payment forms in seconds easily without coding. For Craft CMS 3.x",
   "type": "craft-plugin",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "keywords": [
     "craft",
     "cms",

src/Stripe.php

@@ -27,6 +27,7 @@
 use enupal\stripe\events\AfterPopulatePaymentFormEvent;
 use enupal\stripe\events\OrderCompleteEvent;
 use enupal\stripe\events\WebhookEvent;
+use enupal\stripe\fields\StripePrices;
 use enupal\stripe\fields\StripeProducts;
 use enupal\stripe\services\App;
 use enupal\stripe\services\Carts;
@@ -116,7 +117,11 @@ function(Event $event) {
 
         Event::on(Fields::class, Fields::EVENT_REGISTER_FIELD_TYPES, function(RegisterComponentTypesEvent $event) {
             $event->types[] = StripePaymentFormsField::class;
-            $event->types[] = StripeProducts::class;
+            if (self::getInstance()->is(self::EDITION_PRO)) {
+                $event->types[] = StripeProducts::class;
+                $event->types[] = StripePrices::class;
+            }
+
         });
 
         Event::on(Elements::class, Elements::EVENT_AFTER_SAVE_ELEMENT, function(ElementEvent $event) {

src/elements/Price.php

@@ -96,7 +96,7 @@ public function getCpEditUrl(): ?string
      */
     public function __toString(): string
     {
-        $name = $this->getUnitAmount() ?? $this->stripeId;
+        $name = $this->getLabel() ?? $this->stripeId;
 
         return (string)$name;
     }
@@ -171,13 +171,15 @@ protected static function defineSortOptions(): array
     protected static function defineTableAttributes(): array
     {
         $attributes['stripeId'] = ['label' => StripePlugin::t('Stripe Id')];
+        $attributes['unitAmount'] = ['label' => StripePlugin::t('Unit Amount')];
+        $attributes['type'] = ['label' => StripePlugin::t('Type')];
 
         return $attributes;
     }
 
     protected static function defineDefaultTableAttributes(string $source): array
     {
-        $attributes = ['stripeId', 'unitAmount'];
+        $attributes = ['stripeId', 'unitAmount', 'type'];
 
         return $attributes;
     }
@@ -194,6 +196,10 @@ protected function tableAttributeHtml(string $attribute): string
             {
                 return $this->getUnitAmount();
             }
+            case 'type':
+            {
+                return $this->getType();
+            }
         }
 
         return parent::tableAttributeHtml($attribute);
@@ -243,6 +249,19 @@ public function getUnitAmount()
         return Craft::$app->getFormatter()->asCurrency($unitAmount, $this->getStripeObject()->currency);
     }
 
+    public function getType()
+    {
+        return $this->getStripeObject()->type ?? null;
+    }
+
+    /**
+     * @return string|null
+     */
+    private function getLabel()
+    {
+        return $this->getStripeObject()->nickname ?? null;
+    }
+
     public function getStripeObject()
     {
         if (is_string($this->stripeObject)) {

src/fields/StripePrices.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Stripe Payments plugin for Craft CMS 3.x
+ *
+ * @link      https://enupal.com/
+ * @copyright Copyright (c) 2018 Enupal LLC
+ */
+
+namespace enupal\stripe\fields;
+
+use craft\fields\BaseRelationField;
+use enupal\stripe\elements\Price;
+use enupal\stripe\Stripe as StripePlugin;
+
+/**
+ * Class StripePrices
+ *
+ */
+class StripePrices extends BaseRelationField
+{
+    /**
+     * @inheritdoc
+     */
+    public bool $allowMultipleSources = false;
+
+    /**
+     * @inheritdoc
+     */
+    public static function displayName(): string
+    {
+        return StripePlugin::t('Stripe Prices');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function elementType(): string
+    {
+        return Price::class;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function defaultSelectionLabel(): string
+    {
+        return StripePlugin::t('Add a Stripe Price');
+    }
+}

src/variables/StripeVariable.php

@@ -9,12 +9,15 @@
 namespace enupal\stripe\variables;
 
 use enupal\stripe\elements\db\PaymentFormsQuery;
+use enupal\stripe\elements\db\PriceQuery;
 use enupal\stripe\elements\db\ProductQuery;
 use enupal\stripe\elements\Order;
 use enupal\stripe\elements\db\OrdersQuery;
 use enupal\stripe\elements\PaymentForm;
+use enupal\stripe\elements\Price;
 use enupal\stripe\elements\Product;
 use enupal\stripe\enums\FrequencyType;
+use enupal\stripe\services\App;
 use enupal\stripe\services\PaymentForms;
 use enupal\stripe\Stripe;
 use craft\helpers\Template as TemplateHelper;
@@ -39,6 +42,11 @@ class StripeVariable extends Behavior
      */
     public $paymentForms;
 
+    public function app(): App
+    {
+        return Stripe::$app;
+    }
+
     /**
      * Returns a new OrderQuery instance.
      *
@@ -69,6 +77,21 @@ public function products($criteria = null): ProductQuery
         return $query;
     }
 
+    /**
+     * Returns a new PriceQuery instance.
+     *
+     * @param mixed $criteria
+     * @return PriceQuery
+     */
+    public function prices($criteria = null): PriceQuery
+    {
+        $query = Price::find();
+        if ($criteria) {
+            Craft::configure($query, $criteria);
+        }
+        return $query;
+    }
+
     public function tax()
     {
         return Stripe::$app->taxes;