Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

R2 – Enable Enhanced Conversions #2242

Open
wants to merge 125 commits into
base: develop
Choose a base branch
from
Open

R2 – Enable Enhanced Conversions #2242

wants to merge 125 commits into from

Commits on Feb 2, 2024

  1. Save WIP.

    @asvinb
    asvinb committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    f32b67f View commit details
    Browse the repository at this point in the history

  2. Get correct value from API for accepted terms.

    @asvinb
    asvinb committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    f225bdd View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Add comments to the selectors.

    @asvinb
    asvinb committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    41754d0 View commit details
    Browse the repository at this point in the history

  2. Try to filter out the difference screens.

    @asvinb
    asvinb committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    6302778 View commit details
    Browse the repository at this point in the history

  3. Fix comment.

    @asvinb
    asvinb committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    bfb368f View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. Fix failing tests. 

    F
    @asvinb
    asvinb committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    dd662d9 View commit details
    Browse the repository at this point in the history

  2. Fix failing tests.

    @asvinb
    asvinb committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    748a9d6 View commit details
    Browse the repository at this point in the history

  3. Hopefully last of PHP fixes.

    @asvinb
    asvinb committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    864d74b View commit details
    Browse the repository at this point in the history

  4. Add SettingsPanel.

    @asvinb
    asvinb committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    43595c3 View commit details
    Browse the repository at this point in the history

  5. Common CTA component for Enhanced Conversion.

    @asvinb
    asvinb committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    97f0449 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. Fix polling.

    @asvinb
    asvinb committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    bb6e289 View commit details
    Browse the repository at this point in the history

  2. API endpoint to read/write enhanced conversion status

    @ankitrox
    ankitrox committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    2ee6242 View commit details
    Browse the repository at this point in the history

  3. Conflict resolution

    @ankitrox
    ankitrox committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    0eab3d7 View commit details
    Browse the repository at this point in the history

  4. Update docblock

    @ankitrox
    ankitrox committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    e29cbc9 View commit details
    Browse the repository at this point in the history

  5. Add tests for CTA component.

    @asvinb
    asvinb committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    af8eaf8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/2239-enhanced-conversions-panel' of github.com:… 

    …woocommerce/google-listings-and-ads into feature/2239-enhanced-conversions-panel
    @asvinb
    asvinb committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    0b00e2a View commit details
    Browse the repository at this point in the history

  7. API to read/write EC

    @ankitrox
    ankitrox committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    4b6461d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'feature/2239-enhanced-conversions-panel' of https://git… 

    …hub.com/woocommerce/google-listings-and-ads into feature/2239-enhanced-conversions-panel
    @ankitrox
    ankitrox committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    904d485 View commit details
    Browse the repository at this point in the history

  9. Fix: tests

    @ankitrox
    ankitrox committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    c6c0b25 View commit details
    Browse the repository at this point in the history

  10. Tests: update and get EC status

    @ankitrox
    ankitrox committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    717ad0a View commit details
    Browse the repository at this point in the history

  11. Tests: ads controller

    @ankitrox
    ankitrox committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    3ee62e4 View commit details
    Browse the repository at this point in the history

  12. Add EC status to valid options

    @ankitrox
    ankitrox committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    15e6a95 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Merge branch 'develop' into feature/2239-enhanced-conversions-panel

    @asvinb
    asvinb committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    022200c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/2239-enhanced-conversions-panel' of github.com:… 

    …woocommerce/google-listings-and-ads into feature/2239-enhanced-conversions-panel
    @asvinb
    asvinb committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    e807c0c View commit details
    Browse the repository at this point in the history

  3. Fix: phpcs

    @ankitrox
    ankitrox committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    636f52b View commit details
    Browse the repository at this point in the history

  4. Fix linting errors.

    @asvinb
    asvinb committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    13e7ee8 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/2239-enhanced-conversions-panel' of https://git… 

    …hub.com/woocommerce/google-listings-and-ads into feature/2239-enhanced-conversions-panel
    @ankitrox
    ankitrox committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    55ba363 View commit details
    Browse the repository at this point in the history

  6. Remove non-required test

    @ankitrox
    ankitrox committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    71bfadb View commit details
    Browse the repository at this point in the history

  7. Use new hook instead of usePolling hook for pending status.

    @asvinb
    asvinb committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    dbd8a18 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'feature/2239-enhanced-conversions-panel' of github.com:… 

    …woocommerce/google-listings-and-ads into feature/2239-enhanced-conversions-panel
    @asvinb
    asvinb committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    a9161bd View commit details
    Browse the repository at this point in the history

  9. Fix linting issues.

    @asvinb
    asvinb committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    679253d View commit details
    Browse the repository at this point in the history

  10. Tests: Ads controller

    @ankitrox
    ankitrox committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    16b6767 View commit details
    Browse the repository at this point in the history

  11. Add config for enhanced conversion

    @ankitrox
    ankitrox committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    cff4675 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Review condition to display EC screen.

    @asvinb
    asvinb committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    c063f68 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Fix race condition.

    @asvinb
    asvinb committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    78b97fd View commit details
    Browse the repository at this point in the history

  2. Add more tests.

    @asvinb
    asvinb committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    b85f7de View commit details
    Browse the repository at this point in the history

  3. Tests to enable/disable CTA.

    @asvinb
    asvinb committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    5af67a9 View commit details
    Browse the repository at this point in the history

  4. Add tests for submission guide.

    @asvinb
    asvinb committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    07f16ff View commit details
    Browse the repository at this point in the history

  5. Add user data on purchase page for enhanced conversion

    @ankitrox
    ankitrox committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    3302f7e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/2239-enhanced-conversions-panel' of https://git… 

    …hub.com/woocommerce/google-listings-and-ads into feature/2239-enhanced-conversions-panel
    @ankitrox
    ankitrox committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    9225fa4 View commit details
    Browse the repository at this point in the history

  7. Fix: phpcs issues

    @ankitrox
    ankitrox committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    26c0a65 View commit details
    Browse the repository at this point in the history

  8. revert tag changes

    @ankitrox
    ankitrox committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    d613825 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Option to store data terms in options table

    @ankitrox
    ankitrox committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    783229f View commit details
    Browse the repository at this point in the history

  2. Fix: test for deleting option

    @ankitrox
    ankitrox committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    e180b48 View commit details
    Browse the repository at this point in the history

  3. Update src/Google/GlobalSiteTag.php 

    Update phone number

Co-authored-by: Joe McGill <[email protected]>
    @ankitrox @joemcgill
    ankitrox and joemcgill authored Feb 16, 2024
    Configuration menu
    Copy the full SHA
    672800e View commit details
    Browse the repository at this point in the history

  4. E2E: Enhanced conversion user data test

    @ankitrox
    ankitrox committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    e3cf005 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'update/52310672-google-tag-enhanced-conversion' of http… 

    …s://github.com/woocommerce/google-listings-and-ads into update/52310672-google-tag-enhanced-conversion
    @ankitrox
    ankitrox committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    7523ea1 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Rename folders to be consistent with codebase. 

    Individual screens have their own files now.
    @asvinb
    asvinb committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    4d53889 View commit details
    Browse the repository at this point in the history

  2. Add adsConnected property to glaData.

    @asvinb
    asvinb committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    120d10c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/2239-enhanced-conversions-panel-qa' into featur… 

    …e/2239-enhanced-conversions-panel
    @asvinb
    asvinb committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    327da7d View commit details
    Browse the repository at this point in the history

  4. Have a single endpoint.

    @asvinb
    asvinb committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    2390178 View commit details
    Browse the repository at this point in the history

  5. Add PendingNotice component.

    @asvinb
    asvinb committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    23eff1b View commit details
    Browse the repository at this point in the history

  6. Make use of adsConnected property og glaData.

    @asvinb
    asvinb committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    14f926b View commit details
    Browse the repository at this point in the history

  7. Add adsConnected to global properties.

    @asvinb
    asvinb committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    d6c0039 View commit details
    Browse the repository at this point in the history

  8. Update conditions.

    @asvinb
    asvinb committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    f49f341 View commit details
    Browse the repository at this point in the history

  9. Add filter for TOS value.

    @asvinb
    asvinb committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    d43057a View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Fix condition to display pending state.

    @asvinb
    asvinb committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    5b0731d View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Conflict resolve: develop

    @ankitrox
    ankitrox committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    93f9c4b View commit details
    Browse the repository at this point in the history

  2. Resolve conflicts: merge develop

    @ankitrox
    ankitrox committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    4eae5f4 View commit details
    Browse the repository at this point in the history

  3. Resolve conflict: merge feature/2239-enhanced-conversions-panel

    @ankitrox
    ankitrox committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    9ccbba8 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Update src/API/Google/Ads.php 

    typecast the returned value from apply_filters to a bool

Co-authored-by: Mik <[email protected]>
    @ankitrox @mikkamp
    ankitrox and mikkamp authored Feb 28, 2024
    Configuration menu
    Copy the full SHA
    7549b7a View commit details
    Browse the repository at this point in the history

  2. Update options name with ADS_ prefix

    @ankitrox
    ankitrox committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    b61d133 View commit details
    Browse the repository at this point in the history

  3. Fix: phpcs tests

    @ankitrox
    ankitrox committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    4b7def0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into feature/2239-enhanced-conversions-panel

    @ankitrox
    ankitrox committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    eff7785 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/2239-enhanced-conversions-panel' into update/52… 

    …310672-google-tag-enhanced-conversion
    @ankitrox
    ankitrox committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    62fb97e View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Address code review feedback.

    @asvinb
    asvinb committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    78f6774 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/2239-enhanced-conversions-panel' of github.com:… 

    …woocommerce/google-listings-and-ads into feature/2239-enhanced-conversions-panel
    @asvinb
    asvinb committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    01e67fd View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Add test for disabled button.

    @asvinb
    asvinb committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    6d1c4b2 View commit details
    Browse the repository at this point in the history

  2. Conditionally add enhanced conversion event

    @ankitrox
    ankitrox committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    85e005a View commit details
    Browse the repository at this point in the history

  3. Add adsId property.

    @asvinb
    asvinb committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    1920f47 View commit details
    Browse the repository at this point in the history

  4. Normalize and hash data

    @ankitrox
    ankitrox committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    b43997b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/2239-enhanced-conversions-panel' into update/52… 

    …310672-google-tag-enhanced-conversion
    @ankitrox
    ankitrox committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    a4e289a View commit details
    Browse the repository at this point in the history

  6. Fix: algo name

    @ankitrox
    ankitrox committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    365139c View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Merge branch 'develop' into feature/2239-enhanced-conversions-panel

    @asvinb
    asvinb committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    803ddc0 View commit details
    Browse the repository at this point in the history

  2. Revert to adsConnected property.

    @asvinb
    asvinb committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    db349d2 View commit details
    Browse the repository at this point in the history

  3. Rename prop from onClose to onModalClose.

    @asvinb
    asvinb committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    060aaac View commit details
    Browse the repository at this point in the history

  4. Simplify the useAutoCheckEnhancedConversionTOS hook.

    @asvinb
    asvinb committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    8a4d44e View commit details
    Browse the repository at this point in the history

  5. Remove check to display settings.

    @asvinb
    asvinb committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    42a772e View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Fix: key name for hashed data

    @ankitrox
    ankitrox committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    1c57792 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Merge branch 'develop' into feature/2239-enhanced-conversions-panel

    @joemcgill
    joemcgill committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    4440b27 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. CR feedback implementation.

    @asvinb
    asvinb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    e369351 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/2239-enhanced-conversions-panel' of github.com:… 

    …woocommerce/google-listings-and-ads into feature/2239-enhanced-conversions-panel
    @asvinb
    asvinb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    d6e6dba View commit details
    Browse the repository at this point in the history

  3. Remove unused properties from mocks.

    @asvinb
    asvinb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    e12a768 View commit details
    Browse the repository at this point in the history

  4. Fix linting errors.

    @asvinb
    asvinb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    094b7fb View commit details
    Browse the repository at this point in the history

  5. Use Toggle instead of Button for Enhanced Conversion Settings panel.

    @asvinb
    asvinb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    dd21b22 View commit details
    Browse the repository at this point in the history

  6. Show Spinner while resolving Enhanced Conversion status.

    @asvinb
    asvinb committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    d94a2d2 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Merge branch 'develop' into feature/2239-enhanced-conversions-panel

    @ankitrox
    ankitrox committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    d896b88 View commit details
    Browse the repository at this point in the history

  2. Resolve conflicts: merge develop

    @ankitrox
    ankitrox committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    ea8cd23 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Update tests.

    @asvinb
    asvinb committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    ed233e3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/2239-enhanced-conversions-panel' of github.com:… 

    …woocommerce/google-listings-and-ads into feature/2239-enhanced-conversions-panel
    @asvinb
    asvinb committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    2738535 View commit details
    Browse the repository at this point in the history

  3. Update tests to remove isResolving.

    @asvinb
    asvinb committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    3fb3910 View commit details
    Browse the repository at this point in the history

  4. Check for valid Google Ads account and ID.

    @asvinb
    asvinb committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    8293c5a View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Add EC data prior to firing events

    @joemcgill
    joemcgill committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    e93b854 View commit details
    Browse the repository at this point in the history

  2. Update e2e tests

    @joemcgill
    joemcgill committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    c0da595 View commit details
    Browse the repository at this point in the history

  3. Remove E2E tests for now

    @joemcgill
    joemcgill committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    1afe1d5 View commit details
    Browse the repository at this point in the history

  4. Add e2e tests

    @joemcgill
    joemcgill committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    ce4441e View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2024

  1. Fix JSDoc errors

    @joemcgill
    joemcgill committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    84343ae View commit details
    Browse the repository at this point in the history

  2. Fix tests

    @joemcgill
    joemcgill committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    8ee59b6 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. Enable EC for e2e test

    @joemcgill
    joemcgill committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    72a2f2a View commit details
    Browse the repository at this point in the history

  2. Make disabled test more robust

    @joemcgill
    joemcgill committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    aaa28be View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Merge branch 'develop' into feature/2239-enhanced-conversions-panel

    @asvinb
    asvinb committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    8a87321 View commit details
    Browse the repository at this point in the history

  2. Remove unused adsConnected property.

    @asvinb
    asvinb committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    40a0e8e View commit details
    Browse the repository at this point in the history

  3. Add useGoogleAdsTermsURL hook.

    @asvinb
    asvinb committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    35ab06f View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Show button when EC is disabled.

    @asvinb
    asvinb committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    5d6d8c1 View commit details
    Browse the repository at this point in the history

  2. Fix js tests.

    @asvinb
    asvinb committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    a36070b View commit details
    Browse the repository at this point in the history

  3. Remove unused prop.

    @asvinb
    asvinb committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    512f985 View commit details
    Browse the repository at this point in the history

  4. Add todo note for R1 PR.

    @asvinb
    asvinb committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    7e60441 View commit details
    Browse the repository at this point in the history

  5. Add normalization for email address 

    User order object to add the data
    @ankitrox
    ankitrox committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    7d60a3f View commit details
    Browse the repository at this point in the history

  6. Resolve conflicts during pull

    @ankitrox
    ankitrox committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    447f12a View commit details
    Browse the repository at this point in the history

  7. Add ocid in connection response

    @ankitrox
    ankitrox committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    41189eb View commit details
    Browse the repository at this point in the history

  8. Merge branch 'feature/2239-enhanced-conversions-panel-deeplink' into … 

    …feature/2239-enhanced-conversions-panel
    @asvinb
    asvinb committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    e82a9a9 View commit details
    Browse the repository at this point in the history

  9. Rename constant.

    @asvinb
    asvinb committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    95dc435 View commit details
    Browse the repository at this point in the history

  10. Remove unused code for grabbing the ocid via endpoint.

    @asvinb
    asvinb committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    b568996 View commit details
    Browse the repository at this point in the history

  11. Remove redundant code

    @ankitrox
    ankitrox committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    996286f View commit details
    Browse the repository at this point in the history

  12. Merge branch 'feature/2239-enhanced-conversions-panel' of https://git… 

    …hub.com/woocommerce/google-listings-and-ads into feature/2239-enhanced-conversions-panel
    @ankitrox
    ankitrox committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    37495fa View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Remove hashing from non PII fields and fix merge

    @joemcgill
    joemcgill committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    c2d73c2 View commit details
    Browse the repository at this point in the history

  2. Add local state for pending status.

    @asvinb
    asvinb committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    02a9303 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/2239-enhanced-conversions-panel' of github.com:… 

    …woocommerce/google-listings-and-ads into feature/2239-enhanced-conversions-panel
    @asvinb
    asvinb committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    727b0c0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2258 from woocommerce/update/52310672-google-tag-… 

    …enhanced-conversion

(R2.1f) Google tag enhanced conversion
    @joemcgill
    joemcgill authored Mar 21, 2024
    Configuration menu
    Copy the full SHA
    ed9b948 View commit details
    Browse the repository at this point in the history

  5. Global Site Tag: Move EC data to private method

    @joemcgill
    joemcgill committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    f824205 View commit details
    Browse the repository at this point in the history

  6. Add docblock

    @joemcgill
    joemcgill committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    5ac23ec View commit details
    Browse the repository at this point in the history

  7. Improve loading of EC success modal 

    This adds another side effect to get the campaigns data needed to show the correct 2nd page and removes several instances of loading UI when a selector is resolving. This also adds a new side effect to the CTA when accepting terms that will turn off polling once we've determined that the user has accepted the terms, so the Enable button will be shown.
    @joemcgill
    joemcgill committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    cde898f View commit details
    Browse the repository at this point in the history

  8. Fix tests and linting

    @joemcgill
    joemcgill committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    33f835a View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Fix: fatal error when ads account disconnected

    @ankitrox
    ankitrox committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    e08cbf0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/2239-enhanced-conversions-panel' of https://git… 

    …hub.com/woocommerce/google-listings-and-ads into feature/2239-enhanced-conversions-panel
    @ankitrox
    ankitrox committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    a3fb3e6 View commit details
    Browse the repository at this point in the history