Merge branch 'release/0.8.76'

Author: ljonesfl

.version.json

@@ -2,6 +2,6 @@
   "strategy": "semver",
   "major": 0,
   "minor": 8,
-  "patch": 75,
+  "patch": 76,
   "build": 0
 }

composer.json

@@ -19,6 +19,7 @@
         "neuron-php/jobs": "0.2.*",
         "neuron-php/orm": "0.1.*",
         "neuron-php/dto": "0.0.*",
+        "neuron-php/payments": "0.3.*",
         "rlanvin/php-rrule": "^2.6",
         "phpmailer/phpmailer": "^6.9",
         "cloudinary/cloudinary_php": "^2.0",
@@ -37,6 +38,9 @@
         "codeception/module-asserts": "^3.2",
         "codeception/module-db": "^3.2"
     },
+    "suggest": {
+        "neuron-php/payments": "Adds Stripe-backed donation/payment processing and enables the [donation] shortcode."
+    },
     "autoload": {
         "psr-4": {
             "Neuron\\": "src/"

resources/.cms-manifest.json

@@ -24,7 +24,11 @@
     "20260618120000_add_external_url_to_events.php",
     "20260619140000_add_recurrence_to_events.php",
     "20260619140001_create_event_recurrence_exceptions_table.php",
-    "20260619140002_add_occurrence_date_to_event_registrations.php"
+    "20260619140002_add_occurrence_date_to_event_registrations.php",
+    "20260622000000_create_payments_table.php",
+    "20260622000001_create_subscriptions_table.php",
+    "20260623000000_create_products_table.php",
+    "20260623000001_create_order_items_table.php"
   ],
   "config_files": [
     "auth.yaml",
@@ -42,14 +46,17 @@
     "calendar",
     "contact",
     "content",
+    "donations",
     "email",
     "emails",
     "home",
     "http_codes",
     "layouts",
     "member",
     "pages",
-    "partials"
+    "partials",
+    "payments",
+    "store"
   ],
   "public_assets": [
     ".htaccess",

resources/config/neuron.yaml.example

@@ -248,3 +248,95 @@ contact:
         - { name: name,    label: "Your Name", type: text,     required: true, sender_name: true, rules: { length: { min: 2, max: 80 } } }
         - { name: email,   label: "Email",     type: email,    required: true, reply_to: true }
         - { name: message, label: "Message",   type: textarea, required: true, rules: { length: { min: 10, max: 4000 } } }
+
+# Payments & Subscriptions Configuration
+# Required only by sites that take payments (donations, memberships, ...).
+# Install the optional package first:  composer require neuron-php/payments
+#
+# A single engine drives every payment form via the [payment form="key"]
+# shortcode ( [donation] is a friendly alias ). One-time payments and recurring
+# subscriptions are both supported; each renewal is recorded and the
+# subscription lifecycle ( renewals, cancellations, failed payments ) is driven
+# by a signed webhook at /payments/webhook.
+#
+# Keep secret_key and webhook_secret in your encrypted secrets file
+# (secrets.yml.enc), NOT in this committed config. Only provider/currency and
+# the non-secret form definitions are safe to keep here.
+#
+# Gateway keys:
+#   provider        stripe (only supported provider today)
+#   secret_key      Stripe secret API key (sk_live_... / sk_test_...)
+#   publishable_key Stripe publishable key (pk_...), if you need it client-side
+#   webhook_secret  Stripe signing secret for /payments/webhook (whsec_...)
+#   currency        ISO 4217 currency code (default: usd)
+#
+# Form keys (under payments.forms):
+#   purpose             what the payment is for: donation (default), membership, ...
+#   label               heading shown above the form
+#   button              submit button label
+#   to                  internal email notified when a payment completes
+#   product_name        line-item label shown on the Stripe Checkout page
+#   success_message     thank-you message on the success page
+#   amounts             preset amount tiers in major units (e.g. dollars)
+#   allow_custom_amount true|false - show a "custom amount" input
+#   min_amount          minimum accepted amount in major units
+#   frequencies         allowed cadences: one_time, monthly, quarterly,
+#                       semiannual, annual (omit/[] for one-time only)
+#   fields              payer fields (same schema as contact form fields)
+#
+# Backward compatibility: a legacy top-level `donations:` section (with the same
+# default_form/success_url/cancel_url/forms keys) is still read if `payments`
+# has no forms, so existing donation configs keep working.
+payments:
+  provider: stripe
+  secret_key: ""
+  publishable_key: ""
+  webhook_secret: ""
+  currency: usd
+  default_form: general          # Form rendered by a bare [payment]/[donation] shortcode
+  success_url: "/payments/success"
+  cancel_url: "/payments/cancel"
+  forms:
+    general:
+      purpose: donation
+      label: "Make a Donation"
+      button: "Donate"
+      to: "info@yourdomain.com"
+      product_name: "Donation"
+      success_message: "Thank you for your generous donation!"
+      amounts: [ 25, 50, 100, 250 ]
+      allow_custom_amount: true
+      min_amount: 5
+      frequencies: [ one_time, monthly, quarterly, semiannual, annual ]
+      fields:
+        - { name: name,  label: "Your Name", type: text,  required: true, sender_name: true, rules: { length: { min: 2, max: 80 } } }
+        - { name: email, label: "Email",     type: email, required: true, reply_to: true }
+        - { name: phone, label: "Phone",     type: tel,   required: false }
+
+# ---------------------------------------------------------------------------
+# Store / products ( optional )
+#
+# The catalog itself is managed in the admin ( Content > Products ), not here.
+# A cart purchase is recorded as a payment with purpose "order" and reuses the
+# same Stripe gateway, webhook ( /payments/webhook ), and admin as donations.
+# This section only configures the storefront return URLs and notifications.
+#
+#   title               heading for a bare [products] grid
+#   currency            ISO 4217 ( defaults to payments.currency )
+#   success_url         return URL after a completed order
+#   cancel_url          return URL when the buyer cancels
+#   notification_email  internal recipient for new-order notifications
+#   notification_subject / receipt_subject  optional email subject overrides
+#
+# Shortcodes:
+#   [products]                 grid of active products with add-to-cart
+#   [products limit="6"]       capped grid
+#   [product id="3"]           a single product card
+#   [product slug="t-shirt"]   a single product card by slug
+#   [cart]                     a cart link / summary button
+store:
+  title: "Shop"
+  currency: usd
+  success_url: "/store/success"
+  cancel_url: "/store/cancel"
+  notification_email: "orders@yourdomain.com"

resources/config/services.yaml

@@ -83,6 +83,23 @@ services:
   Neuron\Cms\Repositories\DatabaseContactSubmissionRepository:
     type: autowire
 
+  Neuron\Cms\Repositories\DatabasePaymentRepository:
+    type: autowire
+
+  Neuron\Cms\Repositories\DatabaseSubscriptionRepository:
+    type: autowire
+
+  Neuron\Cms\Repositories\DatabaseProductRepository:
+    type: autowire
+
+  Neuron\Cms\Repositories\DatabaseOrderItemRepository:
+    type: autowire
+
+  # Builds the optional payment gateway from the `payments` config section.
+  # Safe to autowire whether or not neuron-php/payments is installed.
+  Neuron\Cms\Services\Payment\PaymentGatewayFactory:
+    type: autowire
+
 
   # ============================================================================
   # REPOSITORIES - Interface Bindings
@@ -136,6 +153,22 @@ services:
     type: alias
     target: Neuron\Cms\Repositories\DatabaseContactSubmissionRepository
 
+  Neuron\Cms\Repositories\IPaymentRepository:
+    type: alias
+    target: Neuron\Cms\Repositories\DatabasePaymentRepository
+
+  Neuron\Cms\Repositories\ISubscriptionRepository:
+    type: alias
+    target: Neuron\Cms\Repositories\DatabaseSubscriptionRepository
+
+  Neuron\Cms\Repositories\IProductRepository:
+    type: alias
+    target: Neuron\Cms\Repositories\DatabaseProductRepository
+
+  Neuron\Cms\Repositories\IOrderItemRepository:
+    type: alias
+    target: Neuron\Cms\Repositories\DatabaseOrderItemRepository
+
 
   # ============================================================================
   # AUTHENTICATION SERVICES
@@ -350,6 +383,7 @@ services:
       - '@Neuron\Cms\Repositories\DatabaseEventCategoryRepository'
       - '@Neuron\Data\Settings\SettingManager'
       - '@Neuron\Cms\Repositories\DatabaseEventRegistrationRepository'
+      - '@Neuron\Cms\Repositories\DatabaseProductRepository'
 
   Neuron\Cms\Services\Content\ShortcodeParser:
     type: create

resources/database/migrate/20260622000000_create_payments_table.php

@@ -0,0 +1,57 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+/**
+ * Create payments table.
+ *
+ * Stores every individual charge initiated through the [payment] / [donation]
+ * shortcodes: one-time payments AND each recurring subscription invoice ( the
+ * initial charge and every renewal each get their own row ). Fixed columns
+ * capture the gateway/transaction state ( session, payment intent, invoice,
+ * subscription, amount, status ) while the JSON `payload` column holds the
+ * dynamic per-form payer field values, mirroring the contact_submissions
+ * design so the schema stays stable regardless of each form's field set.
+ *
+ * `purpose` ( e.g. donation, membership ) tags what the payment is for, so a
+ * single engine serves donations, memberships, dues, etc. A payment is created
+ * with status "pending" before the payer is redirected to the gateway, then
+ * flipped to "completed" by the verified webhook.
+ */
+class CreatePaymentsTable extends AbstractMigration
+{
+	/**
+	 * Create payments table
+	 */
+	public function change()
+	{
+		$table = $this->table( 'payments', [ 'signed' => false ] );
+
+		$table->addColumn( 'purpose', 'string', [ 'limit' => 32, 'null' => false, 'default' => 'donation' ] )
+			->addColumn( 'form_key', 'string', [ 'limit' => 64, 'null' => false ] )
+			->addColumn( 'provider', 'string', [ 'limit' => 32, 'null' => false, 'default' => 'stripe' ] )
+			->addColumn( 'type', 'string', [ 'limit' => 16, 'null' => false, 'default' => 'one_time' ] )
+			->addColumn( 'session_id', 'string', [ 'limit' => 255, 'null' => true ] )
+			->addColumn( 'payment_intent_id', 'string', [ 'limit' => 255, 'null' => true ] )
+			->addColumn( 'invoice_id', 'string', [ 'limit' => 255, 'null' => true ] )
+			->addColumn( 'subscription_id', 'string', [ 'limit' => 255, 'null' => true ] )
+			->addColumn( 'amount_cents', 'integer', [ 'null' => false, 'default' => 0 ] )
+			->addColumn( 'currency', 'string', [ 'limit' => 8, 'null' => false, 'default' => 'usd' ] )
+			->addColumn( 'frequency', 'string', [ 'limit' => 32, 'null' => false, 'default' => 'one_time' ] )
+			->addColumn( 'status', 'string', [ 'limit' => 32, 'null' => false, 'default' => 'pending' ] )
+			->addColumn( 'payer_name', 'string', [ 'limit' => 255, 'null' => true ] )
+			->addColumn( 'payer_email', 'string', [ 'limit' => 255, 'null' => true ] )
+			->addColumn( 'payload', 'text', [ 'null' => false, 'default' => '{}' ] )
+			->addColumn( 'ip_address', 'string', [ 'limit' => 45, 'null' => true ] )
+			->addColumn( 'user_agent', 'string', [ 'limit' => 500, 'null' => true ] )
+			->addColumn( 'completed_at', 'timestamp', [ 'null' => true ] )
+			->addColumn( 'created_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP' ] )
+			->addIndex( [ 'purpose' ] )
+			->addIndex( [ 'form_key' ] )
+			->addIndex( [ 'status' ] )
+			->addIndex( [ 'session_id' ] )
+			->addIndex( [ 'subscription_id' ] )
+			->addIndex( [ 'created_at' ] )
+			->create();
+	}
+}

resources/database/migrate/20260622000001_create_subscriptions_table.php

@@ -0,0 +1,47 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+/**
+ * Create subscriptions table.
+ *
+ * Tracks the lifecycle of a recurring agreement created through a recurring
+ * [payment] / [donation] ( e.g. a monthly donation or a membership ). One
+ * subscription row owns many `payments` rows ( the initial charge plus every
+ * renewal ), linked by the gateway `subscription_id`.
+ *
+ * The row is created when the checkout that started the subscription completes,
+ * its `status` / `current_period_end` are kept current by subscription and
+ * invoice webhooks, and it is marked canceled when the agreement ends.
+ */
+class CreateSubscriptionsTable extends AbstractMigration
+{
+	/**
+	 * Create subscriptions table
+	 */
+	public function change()
+	{
+		$table = $this->table( 'subscriptions', [ 'signed' => false ] );
+
+		$table->addColumn( 'purpose', 'string', [ 'limit' => 32, 'null' => false, 'default' => 'donation' ] )
+			->addColumn( 'form_key', 'string', [ 'limit' => 64, 'null' => false ] )
+			->addColumn( 'provider', 'string', [ 'limit' => 32, 'null' => false, 'default' => 'stripe' ] )
+			->addColumn( 'subscription_id', 'string', [ 'limit' => 255, 'null' => false ] )
+			->addColumn( 'status', 'string', [ 'limit' => 32, 'null' => false, 'default' => 'active' ] )
+			->addColumn( 'frequency', 'string', [ 'limit' => 32, 'null' => false, 'default' => 'monthly' ] )
+			->addColumn( 'amount_cents', 'integer', [ 'null' => false, 'default' => 0 ] )
+			->addColumn( 'currency', 'string', [ 'limit' => 8, 'null' => false, 'default' => 'usd' ] )
+			->addColumn( 'payer_name', 'string', [ 'limit' => 255, 'null' => true ] )
+			->addColumn( 'payer_email', 'string', [ 'limit' => 255, 'null' => true ] )
+			->addColumn( 'payload', 'text', [ 'null' => false, 'default' => '{}' ] )
+			->addColumn( 'current_period_end', 'timestamp', [ 'null' => true ] )
+			->addColumn( 'canceled_at', 'timestamp', [ 'null' => true ] )
+			->addColumn( 'created_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP' ] )
+			->addColumn( 'updated_at', 'timestamp', [ 'null' => true ] )
+			->addIndex( [ 'purpose' ] )
+			->addIndex( [ 'form_key' ] )
+			->addIndex( [ 'status' ] )
+			->addIndex( [ 'subscription_id' ], [ 'unique' => true ] )
+			->create();
+	}
+}

resources/database/migrate/20260623000000_create_products_table.php

@@ -0,0 +1,40 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+/**
+ * Create products table.
+ *
+ * Backs the storefront catalog ( [product] / [products] shortcodes and the
+ * admin Products screen ). Each product is a fixed-price, one-time item that
+ * can be added to the cart and purchased through hosted Stripe Checkout. The
+ * order itself is recorded in the shared `payments` table ( purpose = "order" )
+ * with one `order_items` row per line, so the catalog stays decoupled from the
+ * transaction record.
+ */
+class CreateProductsTable extends AbstractMigration
+{
+	/**
+	 * Create products table
+	 */
+	public function change()
+	{
+		$table = $this->table( 'products', [ 'signed' => false ] );
+
+		$table->addColumn( 'name', 'string', [ 'limit' => 255, 'null' => false ] )
+			->addColumn( 'slug', 'string', [ 'limit' => 255, 'null' => false ] )
+			->addColumn( 'sku', 'string', [ 'limit' => 64, 'null' => true ] )
+			->addColumn( 'description', 'text', [ 'null' => true ] )
+			->addColumn( 'price_cents', 'integer', [ 'null' => false, 'default' => 0 ] )
+			->addColumn( 'currency', 'string', [ 'limit' => 8, 'null' => false, 'default' => 'usd' ] )
+			->addColumn( 'image_url', 'string', [ 'limit' => 512, 'null' => true ] )
+			->addColumn( 'active', 'boolean', [ 'null' => false, 'default' => true ] )
+			->addColumn( 'sort_order', 'integer', [ 'null' => false, 'default' => 0 ] )
+			->addColumn( 'created_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP' ] )
+			->addColumn( 'updated_at', 'timestamp', [ 'null' => true ] )
+			->addIndex( [ 'slug' ], [ 'unique' => true ] )
+			->addIndex( [ 'active' ] )
+			->addIndex( [ 'sort_order' ] )
+			->create();
+	}
+}

resources/database/migrate/20260623000001_create_order_items_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+/**
+ * Create order_items table.
+ *
+ * An order is a row in the shared `payments` table ( purpose = "order" ); this
+ * table holds its individual lines. Each row snapshots the product name, SKU,
+ * unit price and quantity at purchase time so the historical order is stable
+ * even if the catalog product is later edited or removed.
+ */
+class CreateOrderItemsTable extends AbstractMigration
+{
+	/**
+	 * Create order_items table
+	 */
+	public function change()
+	{
+		$table = $this->table( 'order_items', [ 'signed' => false ] );
+
+		$table->addColumn( 'payment_id', 'integer', [ 'null' => false ] )
+			->addColumn( 'product_id', 'integer', [ 'null' => true ] )
+			->addColumn( 'name', 'string', [ 'limit' => 255, 'null' => false ] )
+			->addColumn( 'sku', 'string', [ 'limit' => 64, 'null' => true ] )
+			->addColumn( 'unit_amount_cents', 'integer', [ 'null' => false, 'default' => 0 ] )
+			->addColumn( 'quantity', 'integer', [ 'null' => false, 'default' => 1 ] )
+			->addColumn( 'currency', 'string', [ 'limit' => 8, 'null' => false, 'default' => 'usd' ] )
+			->addColumn( 'created_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP' ] )
+			->addIndex( [ 'payment_id' ] )
+			->addIndex( [ 'product_id' ] )
+			->create();
+	}
+}