chore: Release v7

.editorconfig

@@ -9,17 +9,12 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
-indent_style = space
-indent_size = 2
-
-# PHP files
-[*.php]
-indent_size = 4
+indent_style = tab
 
 # Markdown files
 [*.md]
 trim_trailing_whitespace = false
 
-# Indentation override for all HTML, CSS/SCSS, JS, and Vue files
-[*.{html,css,scss,js,vue,twig}]
-indent_style = tab
+[*.{md,yaml,yml}]
+indent_size = 2
+indent_style = space

CHANGELOG.md

@@ -1,247 +1,10 @@
 # Release Notes for KlaviyoConnect
 
+<<<<<<< HEAD
 ## 6.0.0
+=======
+## 7.0.0
+>>>>>>> acf32ee (chore: Release v7)
 
-### Updated
-- Uses official klaviyo/api package.
-- Renamed `useSubscribeEndpoint` to `subscribe`.
-- User profile now uses `external_id` instead of `id`.
-- Renamed `event_id` to `unique_id`.
-- Changed `identify` function to include an `$update` argument.
-- `identify` action can update an existing profile.
-- Updated `trackOrder` to include the order currency in the event details.
+- Migrated to Craft 5 and Commerce 5
 
-### Added
-- Provide `email` and/or `phone_number` when `subscribe` is `true` to provide consent for subscription to those channels.
-- Added `value_currency` to event details.
-
-### Removed
-- Removed track once event.
-- Remove `profileInList` API service function.
-- Removed `update-profile` action. Update profiles using identify and track endpoints instead.
-- Removed `updateProfile` API service method.
-
-## 5.0.8 - 2024-03-21
-
-- Use correct Craft control panel icon
-
-## 5.0.7 - 2024-03-21
-
-- Update plugin branding
-
-## 5.0.6 - 2024-01-29
-
-- Use `cpTrigger` config when triggering an order sync to Klaviyo from Utilities
-
-## 5.0.5 - 2023-02-27
-
-- Fix issue where the plugin would attempt to fetch lists when the Klaviyo API key was not set
-- Include order timestamps when synchronizing orders from the control panel
-
-## 5.0.4 - 2023-02-27
-
-- Fix missing type hint in API controller
-
-## 5.0.3 - 2022-06-30
-
-- Adding version constraints
-
-## 5.0.2 - 2022-06-30
-
-- Fixing messed up releases where it was possible to install 5.0.1 on Craft 3
-
-## 5.0.1 - 2022-06-29
-
-- Fix issue with PHP Typing error on settings screen
-
-## 5.0.0 - 2022-06-15
-
-- Separate Craft 4 version
-
-## 4.0.10 - 2022-06-13
-## Added
-
-- Added a service method to retrieve a Klaviyo Person ID using an email address
-- Added a service method to update a Klaviyo profile
-- Added a controller method for updating a Klaviyo profile
-
-## 4.0.9 - 2022-06-07
-
-## Fixed
-
-- Fixes issue in Lists field type where list selection isn't saved, or previous setting is nulled, if the entry is first saved by an automatic draft.
-
-### Added
-
-- The plugin now works with Craft 4
-
-## 4.0.8 - 2021-10-21
-
-### Fixed
-
-- Fixes error with guest checkouts when custom product image field doesn't exist on products or variants
-
-## 4.0.7 - 2021-09-27
-
-### Added
-
-- Klaviyo Connect will now use a variants product image if present before using
-  the products image ([#67](https://github.com/FosterCommerce/klaviyoconnect/pull/67))
-
-## 4.0.6 - 2021-08-23
-
-### Added
-
-- Added support for Guzzle 7.2
-
-## 4.0.5 - 2021-07-16
-
-### Added
-
-- Added the `useSubscribeEndpoint` parameter to the `klaviyoconnect/api/track` action to make it possible to use Klaviyo’s `subscribe` endpoint instead of `members`, which has the benefit of respecting the double opt-in setting of the list
-
-## 4.0.4 - 2021-01-11
-
-### Fixed
-
-- Fixes error when updating cart without a billing address
-
-## 4.0.3 - 2020-11-23
-
-### Added
-
-- Passes customer billing name to Klaviyo when the user completes an order as guest
-
-## 4.0.2 - 2020-10-02
-
-#### Fixed
-
-- Value of Product Type is now the `name` not the full object
-
-## 4.0.1 - 2020-10-01
-
-#### Added
-
-- Product Type with line item data sent with events
-
-#### Fixed
-
-- Value on Ordered Product events
-
-## 4.0.0 - 2020-09-29
-
-#### Added
-
-- Add tracking for order status changes
-- Add tracking for refund transactions
-- Add ability to disable tracking for specific events
-- Add ability to push historical Commerce orders to Klaviyo
-
-#### Updated
-
-- Fix bug where events triggered by admins cause admin account to get tracked in Klaviyo.
-- Fix bug with line item formatting on events where they would show up as strings instead of arrays.
-
-## 3.2.0 - 2020-09-18
-
-#### Updated
-
-- Merged #27
-- Fix line items when passed as a string (such as through hidden fields in Twig) to `json_decode` the string before sending to Klaviyo.
-
-## 3.1.3 - 2020-01-24
-
-#### Updated
-
-- Fix an error that occurs when saving a user due to `klaviyoAvailableGroups` setting being an array.
-
-## 3.1.2 - 2019-12-04
-
-#### Updated
-
-- Allow tracking events with a timestamp.
-- Allow using environment variables for public and private keys in plugin config.
-
-## 3.1.1 - 2019-07-29
-
-#### Updated
-
-- Use response code for error message instead of relying on an error code in the Klaviyo API response body.
-
-## 3.1.0 - 2019-05-20
-
-#### Removed
-
-- Removed `Base::getSpecialProperties()`
-- Removed `confirmOptIn` from add to list code
-
-#### Updated
-
-- Updated Klaviyo List API calls to V2
-
-#### Added
-- Added GDPR consent related fields on the `Profile` model
-
-## 3.0.4 - 2019-04-29
-
-#### Updated
-
-- `Track::createProfile` is now protected
-- Fix an error when a line item's purchasable has no Product attached
-- Users can now listen to the `Track::ADD_LINE_ITEM_CUSTOM_PROPERTIES` event for any line item regardless whether it has a Product attached or not
-
-## 3.0.3 - 2019-04-04
-
-#### Updated
-
-- Fetch the first product image for each line item
-
-## 3.0.2 - 2019-04-04
-
-#### Updated
-
-- Replaced deprecated `includecss` and `includejs` Twig tags
-
-## 3.0.1 - 2019-04-01
-
-#### Updated
-
-- Fixed `profileMappings` on Settings page
-- Ensure Craft Commerce is installed and enabled before adding event listeners
-- Check for Craft Commerce before tracking order events
-- Check for Craft Commerce when calling the restore cart action
-
-## 3.0.0 - 2019-03-28
-
-#### Removed
-
-- Profile mappings and related events, variables, etc
-
-#### Updated
-
-- Restructured data sent to Klaviyo
-- Custom properties are added to the root of models instead of to the `$extra` property
-- User profile mapping is based on logged in user and data sent with the `profile[]` form parameter
-- Replaced `events` service with `track`
-- Renamed events to align with Klaviyo language (`AddProfilePropertiesEvent`, `AddCustomPropertiesEvent`, etc)
-- Changed `api/update-profile` to `api/track`
-- Fixed error when adding a user to a Klaviyo list
-- Added `addToLists` to Track service
-- Added docs site
-
-#### Added
-
-- Order and Line Item events for users to add custom properties onto event bodies
-- Profile event to add custom properties to user profiles
-
-### 2.0.6 - 2019-02-28
-
-- Changed `trackOrder` and `getOrderDetails` visibility.
-
-## 2.0.1 - 2018-09-19
-
-- Fixed user service events.
-
-## 2.0.0 - 2018-06-26
-
-- Migrated to Craft 3.

composer.json

@@ -2,7 +2,7 @@
   "name": "fostercommerce/klaviyoconnect",
   "description": "Craft Commerce",
   "type": "craft-plugin",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "keywords": [
     "klaviyo"
   ],
@@ -24,8 +24,8 @@
   },
   "require-dev": {
     "craftcms/commerce": "^5.0.0",
-    "craftcms/phpstan": "dev-main",
-    "craftcms/rector": "dev-main",
+		"craftcms/phpstan": "dev-main",
+		"craftcms/rector": "dev-main",
     "fostercommerce/ecs": "dev-main",
     "fostercommerce/rector": "dev-main",
     "phpstan/phpstan": "^1.11",

ecs.php

@@ -5,7 +5,7 @@
 use fostercommerce\ecs\ECSConfig;
 
 return ECSConfig::configure()
-    ->withPaths([
-        __DIR__ . '/src',
-        __FILE__,
-    ]);
+	->withPaths([
+		__DIR__ . '/src',
+		__FILE__,
+	]);