Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: NPM install
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x

Expand All @@ -31,7 +31,7 @@ jobs:
run: npm run test

- name: Archive npm failure logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: npm-logs
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
needs: confirm-public-repo-master-branch
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: NPM install
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x

Expand All @@ -43,7 +43,7 @@ jobs:
run: npm run test

- name: Archive npm failure logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: npm-logs
Expand All @@ -57,7 +57,7 @@ jobs:
- confirm-public-repo-master-branch
steps:
- name: Checkout development branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: mparticle-integrations/mparticle-javascript-integration-google-analytics-4
ref: development
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
run: |
git pull origin release/${{ github.run_number }}
- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x

Expand All @@ -118,7 +118,7 @@ jobs:
npx semantic-release

- name: Archive npm failure logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: npm-logs
Expand All @@ -135,7 +135,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout master branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
repository: ${{ github.repository }}
Expand Down
2 changes: 1 addition & 1 deletion packages/GA4Client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions packages/GA4Client/src/commerce-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,9 @@ function parseProduct(product, affiliation) {
case 'Variant':
productWithAllAttributes.item_variant = product.Variant;
break;
case 'Position':
productWithAllAttributes.index = product.Position;
break;
case 'Attributes':
break;
default:
Expand Down
34 changes: 17 additions & 17 deletions packages/GA4Client/test/src/tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand All @@ -319,7 +319,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand Down Expand Up @@ -806,7 +806,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand All @@ -820,7 +820,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand Down Expand Up @@ -1071,7 +1071,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand All @@ -1085,7 +1085,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand Down Expand Up @@ -1169,7 +1169,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand All @@ -1183,7 +1183,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand Down Expand Up @@ -1352,7 +1352,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand All @@ -1366,7 +1366,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand Down Expand Up @@ -1989,7 +1989,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand Down Expand Up @@ -2252,7 +2252,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
test4ever___: 'tester',
Expand All @@ -2268,7 +2268,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand Down Expand Up @@ -2354,7 +2354,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand All @@ -2371,7 +2371,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand Down Expand Up @@ -2456,7 +2456,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand All @@ -2473,7 +2473,7 @@ describe('Google Analytics 4 Event', function () {
item_id: 'iphoneSKU',
item_name: 'iphone',
item_variant: 'variant',
position: 1,
index: 1,
price: 999,
quantity: 1,
total_amount: 999,
Expand Down