Merge branch 'release/3.0.0' into v3

nystudio107 · Oct 31, 2023 · f4b6e37 · f4b6e37
2 parents 061809c + d29b3f7
commit f4b6e37
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/build-and-deploy-docs.yml b/.github/workflows/build-and-deploy-docs.yml
@@ -35,7 +35,7 @@ jobs:
  - name: rsync deployments
  uses: burnett01/rsync-deployments@4.1
  with:
- switches: -avzr --delete
+ switches: -avzr
  path: ./dist/
  remote_path: ${{ secrets.NYS_DOCS_ROOT }}${{ env.DOCS_DEST_DIR }}
  remote_host: ${{ secrets.NYS_DEPLOY_REMOTE_HOST }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Instant Analytics GA4 Changelog
 
+## 3.0.0 - 2023.10.31
+### Added
+* Add currency to all Commerce GA4 events, but better. ([#20](https://github.com/nystudio107/craft-instantanalytics-ga4/issues/20))
+
 ## 3.0.0-beta.4 - 2023.10.23
 ### Added
 * Add currency to all Commerce GA4 events. ([#20](https://github.com/nystudio107/craft-instantanalytics-ga4/issues/20))

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
  "name": "nystudio107/craft-instantanalytics-ga4",
  "description": "Instant Analytics brings full Google Analytics support to your Twig templates and automatic Craft Commerce integration with Google Enhanced Ecommerce",
  "type": "craft-plugin",
- "version": "3.0.0-beta.4",
+ "version": "3.0.0",
  "keywords": [
  "craft",
  "cms",

diff --git a/src/services/Commerce.php b/src/services/Commerce.php
@@ -179,7 +179,6 @@ protected function addProductDataFromLineItem(ItemBaseEvent $event, LineItem $li
  $eventItem->setItemId($purchasable->getSku() ?? $lineItem->getSku());
  $eventItem->setPrice($lineItem->salePrice);
  $eventItem->setQuantity($lineItem->qty);
- $eventItem->setCurrency(CommercePlugin::getInstance()->getPaymentCurrencies()->getPrimaryPaymentCurrencyIso());
 
  // Handle this purchasable being a Variant
  if (is_a($purchasable, Variant::class)) {
@@ -443,6 +442,8 @@ protected function getNewItemParameter(): ItemParameter
  {
  $parameter = new ItemParameter();
  $parameter->setAffiliation(InstantAnalytics::$plugin->ga4->getAnalytics()->getAffiliation());
+ $parameter->setCurrency(CommercePlugin::getInstance()->getPaymentCurrencies()->getPrimaryPaymentCurrencyIso());
+
  return $parameter;
  }
 }