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.

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

Merge feature/button to master #272

Merged
merged 112 commits into from
Jun 18, 2024
Merged

Merge feature/button to master #272

merged 112 commits into from
Jun 18, 2024

Commits on Jul 8, 2021

  1. Configuration menu
    Copy the full SHA
    359aacc View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2021

  1. Configuration menu
    Copy the full SHA
    20051c4 View commit details
    Browse the repository at this point in the history
  2. Add api-plus to set of valid hosts

    This is required for the V3/Button functionality
    nesevis committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    f3d7b4e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    84bce2e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d27a831 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3f1fd8b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5981219 View commit details
    Browse the repository at this point in the history
  7. Clean up example code

    nesevis committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    f4763be View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6e0b515 View commit details
    Browse the repository at this point in the history
  9. Update project file

    nesevis committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    5620f02 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    265a93c View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    f694936 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    be3ef15 View commit details
    Browse the repository at this point in the history
  13. Add Codable support to Configuration model

    This is required now that the Afterpay SDK is interacting directly with the API rather than through a merchant API
    nesevis committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    892f373 View commit details
    Browse the repository at this point in the history
  14. Add fetchMerchantConfiguration function

    Previously, this object was retrieved via the merchant’s API. Now, we add an option to fetch it directly for V3 use
    nesevis committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    73e8ed0 View commit details
    Browse the repository at this point in the history
  15. Fix formatting

    nesevis committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    db0cbd8 View commit details
    Browse the repository at this point in the history
  16. Move ApiV3 up one level

    nesevis committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    10b23cd View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    82e4990 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    ac8fcf0 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    5cbc548 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    98d89c0 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2021

  1. Add newline to comment

    nesevis committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    f02965d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9dca600 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    59f6759 View commit details
    Browse the repository at this point in the history
  4. Add ApiV3.request overload that returns a Void result

    This is handy for cases where the response body is 204/empty but valid
    nesevis committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    3e82f0a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d469d51 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    839a893 View commit details
    Browse the repository at this point in the history
  7. Remove unused types

    nesevis committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    ad12428 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    1d4184a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    e892778 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    aa37c41 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    9ae69dc View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    da139a4 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    67e0326 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    d9785e9 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    192b9db View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    c09a258 View commit details
    Browse the repository at this point in the history
  17. Change Checkout amount to use OrderTotal’s new total property

    Previously, we were assuming that the Afterpay API would calculate the total from `amount`, `shippingAmount` and `taxAmount`.
    
    Now, we know that the two latter properties are for fraud prevention purposes, and that `amount` should always reflect the total that should be charged to the customer
    nesevis committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    1bccb81 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2021

  1. Configuration menu
    Copy the full SHA
    61a6e85 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1fcf296 View commit details
    Browse the repository at this point in the history
  3. Remove V3 functionality to cancel virtual cards

    As requested by Vish Rathinavelu
    nesevis committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    3af63f6 View commit details
    Browse the repository at this point in the history
  4. Remove V3references to merchantPublicKey

    This property is actually `shopDirectoryId`
    nesevis committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    52b36fa View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0ff0178 View commit details
    Browse the repository at this point in the history
  6. Set Afterpay.configuration

    nesevis committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    ab52fd4 View commit details
    Browse the repository at this point in the history
  7. Make OrderTotal explicit about passing in the full amount as total

    Previously, there was a certain level of ambiguity.
    
    Now, documentation informs the user that the `total` is required to be inclusive of `shipping` and `tax`
    nesevis committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    4353634 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    4843320 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2021

  1. Configuration menu
    Copy the full SHA
    922ad82 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    110edc0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    afcffe2 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2021

  1. Rename PaymentButton.configuration to avoid name collision

    Previously, PaymentButton had a private `configuration` property which contained an SVGConfiguration. That property name is used in iOS 15, so we cannot use it for our own private one. We can rename it to something unused, instead. We have renamed it to `svgConfiguration`.
    nesevis committed Aug 16, 2021
    Configuration menu
    Copy the full SHA
    d7deca2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    13b2938 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    097bc8a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    54ce28f View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2021

  1. Configuration menu
    Copy the full SHA
    9531de7 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2021

  1. Configuration menu
    Copy the full SHA
    96a7694 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    121ae1e View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2021

  1. Configuration menu
    Copy the full SHA
    4f50ae9 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. Merge pull request #177 from apederson94/feature/button

    fixed issue where SWXMLHash was being updated for cocoapods users above v5.0.1
    ScottAntonacAP authored Sep 30, 2021
    Configuration menu
    Copy the full SHA
    9e31fcf View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2021

  1. Configuration menu
    Copy the full SHA
    a47d36b View commit details
    Browse the repository at this point in the history
  2. fix readme typo

    ScottAntonacAP committed Oct 1, 2021
    Configuration menu
    Copy the full SHA
    679522f View commit details
    Browse the repository at this point in the history
  3. Update GitHub Actions Xcode to 12.5.1

    GitHub Actions no longer supports Xcode 12.0. We will now use 12.5.1.
    
    Available options at the time of writing are: 13.0 (beta), 13.0, 12.5.1, 12.5, 12.4, 11.7. We chose 12.5.1 because 13 has been having stability issues for many people.
    huwr authored and ScottAntonacAP committed Oct 1, 2021
    Configuration menu
    Copy the full SHA
    cd8dad2 View commit details
    Browse the repository at this point in the history
  4. Bump simulator version to 14.5

    huwr authored and ScottAntonacAP committed Oct 1, 2021
    Configuration menu
    Copy the full SHA
    95035a4 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2022

  1. Configuration menu
    Copy the full SHA
    bad4f44 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9f27ef0 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2022

  1. Merge pull request #206 from afterpay/maintenance/update-feature-butt…

    …on-to-latest
    
    Maintenance: merge master to feature button
    ScottAntonacAP authored Mar 23, 2022
    Configuration menu
    Copy the full SHA
    06e9a43 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. Configuration menu
    Copy the full SHA
    f5d2a6a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    237adcf View commit details
    Browse the repository at this point in the history
  3. Merge pull request #210 from afterpay/maintenance/merge-master-to-fea…

    …ture-button
    
    Maintenance: merge master to feature/button
    ScottAntonacAP authored Apr 6, 2022
    Configuration menu
    Copy the full SHA
    2a6273e View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2022

  1. Configuration menu
    Copy the full SHA
    9bd0d92 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #214 from afterpay/maintenance/merge-master-to-fea…

    …ture-button
    
    maintenance: merge master to feature button
    ScottAntonacAP authored Apr 11, 2022
    Configuration menu
    Copy the full SHA
    731212f View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2022

  1. Configuration menu
    Copy the full SHA
    84e8080 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #217 from afterpay/maintenance/merge-master-to-fea…

    …ture-button
    
    maintenance: merge master to feature button (v4.5.1)
    ScottAntonacAP authored Apr 14, 2022
    Configuration menu
    Copy the full SHA
    3726667 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2022

  1. Configuration menu
    Copy the full SHA
    58266bf View commit details
    Browse the repository at this point in the history
  2. Merge pull request #220 from afterpay/maintenance/merge-master-4.5.2-…

    …to-feature-button
    
    Maintenance: merge master 4.5.2 to feature button
    ScottAntonacAP authored Apr 22, 2022
    Configuration menu
    Copy the full SHA
    5f8caf2 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2022

  1. Configuration menu
    Copy the full SHA
    a552c4a View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2022

  1. Merge pull request #221 from afterpay/fix/feature-button-remove-group…

    …ing-separator-from-amounts
    
    Remove grouping separator in sent amount for v3
    ScottAntonacAP authored Apr 26, 2022
    Configuration menu
    Copy the full SHA
    4cdd1c7 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2022

  1. Configuration menu
    Copy the full SHA
    1433d50 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2fd2f07 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #224 from afterpay/maintenance/merge-master-5.0.0-…

    …to-feature-button
    
    Maintenance: merge master 5.0.0 to feature button
    ScottAntonacAP authored Jul 25, 2022
    Configuration menu
    Copy the full SHA
    11b814d View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2022

  1. Configuration menu
    Copy the full SHA
    d7dfe96 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0852ba6 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2022

  1. Merge pull request #233 from afterpay/maintenance/merge-master-5.1.0-…

    …to-feature-button
    
    [EIT-1947] Maintenance: merge master 5.1.0 to feature button
    ScottAntonacAP authored Sep 9, 2022
    Configuration menu
    Copy the full SHA
    8ae8240 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2022

  1. Configuration menu
    Copy the full SHA
    901e659 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2022

  1. Merge pull request #239 from afterpay/maintenance/merge-master-5.2.0-…

    …to-feature-button
    
    EIT-2198: Maintenance: merge master 5.2.0 to feature button
    ScottAntonacAP authored Oct 31, 2022
    Configuration menu
    Copy the full SHA
    90136c5 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. Configuration menu
    Copy the full SHA
    6b69241 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #248 from afterpay/maintenance/merge-master-5.3.0-…

    …to-feature-button
    
    EIT-2574: Maintenance: merge master 5.3.0 to feature button
    ScottAntonacAP authored Mar 10, 2023
    Configuration menu
    Copy the full SHA
    47e5b96 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Merge branch 'master' into maintenance/merge-master-5.4.0-to-feature-…

    …button
    
    * master:
      EIT-2966 - prepare for release 5.4.0
      EIT-2917: update pages deploy deps
      EIT-2879 - use resource_bundles in podspec instead of resources
      EIT-2361 - add ability to set consumer locale
      EIT-2874 - typos and formatting of checkout-v1 docs
      EIT-2874 - revert change to docs for checkout V2
      EIT-2828 - fix typo in docs
      EIT-2828 - update docs with checkout support
      EIT-2874 - update docs for redirect urls
      EIT-2872 - update documentation dependencies
      fix example app api endpoint for example server
      EIT-2872 - update project dependencies
    ScottAntonacAP committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    6017449 View commit details
    Browse the repository at this point in the history
  2. fix missing import

    ScottAntonacAP committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    7edf9f5 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Merge pull request #257 from afterpay/maintenance/merge-master-5.4.0-…

    …to-feature-button
    
    EIT-2966: Merge master 5.4.0 to feature/button
    ScottAntonacAP authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    d84ddc2 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Merge branch 'master' into maintenance/merge-master-5.5.0-to-feature-…

    …button
    
    * master:
      EIT-3948 - prepare for release 5.5.0
      feat: support consumerLocale in obj-c [EIT-3944]
      EIT-3043 - remove EU assets
    ScottAntonacAP committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    62d3048 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Merge branch 'master' into maintenance/merge-master-5.6.0-to-feature-…

    …button
    
    * master:
      chore: prepare release v5.6.0 (EIT-4065)
      ci: downgrade ci test simlator
      test: longer wait time
      fix(ci): revert simulator os
      fix(ci): github runner didn't have simulator version
      ci(fix): change the simulator version
      fix(ci): change dev directory in actions
      fix(obj-c): make static var optional (EIT-4059)
      fix(ci): address flaky test (json prop order)
      chore(ci): update test iphone
      chore(ci): update for latest runner
      feat(obj-c): add cash app methods (EIT-4059)
      feat: add collected data types to privacy manifest (EIT-4057)
      feat: add privacy manifest (EIT-4057)
    ScottAntonacAP committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    75fe447 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #265 from afterpay/maintenance/merge-master-5.6.0-…

    …to-feature-button
    
    maintenance: merge master 5.6.0 to feature button
    ScottAntonacAP authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    682173f View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Merge branch 'master' into maintenance/merge-master-5.6.1-to-feature-…

    …button
    
    * master:
      chore: prepare release v5.6.1 (EIT-4073)
      fix(obj-c): make cashAppClientId public
      fix(docs): change px to rem for compatibility
    ScottAntonacAP committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    a82b764 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #269 from afterpay/maintenance/merge-master-5.6.1-…

    …to-feature-button
    
    Maintenance/merge master 5.6.1 to feature button
    ScottAntonacAP authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    0a504ab View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Button with Cash App Pay

    mmroz committed May 31, 2024
    Configuration menu
    Copy the full SHA
    4f68396 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Added tests for Afterpay

    mmroz committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    38d4d4a View commit details
    Browse the repository at this point in the history
  2. method naming

    mmroz committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    459d48b View commit details
    Browse the repository at this point in the history
  3. Added example code

    mmroz committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    01a9ae1 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. updated picker

    mmroz committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    75cae89 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Merge pull request #271 from afterpay/markmroz/button

    Button with Cash App Pay
    mmroz authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    211f56a View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Configuration menu
    Copy the full SHA
    ac75afb View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Updated from comments

    mmroz committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    a7bffd9 View commit details
    Browse the repository at this point in the history
  2. added tests for Cash App Pay

    mmroz committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    3ffeada View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. fix button webview

    mmroz committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    383d8a4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #273 from afterpay/markmroz/button-configs

    V3Configs for Cash App Pay checkout
    mmroz authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    ceb7a38 View commit details
    Browse the repository at this point in the history
  3. docs: add checkout diagrams

    ScottAntonacAP authored and mmroz committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    3fcad6f View commit details
    Browse the repository at this point in the history
  4. Updated parchase login for CAP

    mmroz committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    5ccb1fd View commit details
    Browse the repository at this point in the history
  5. default to V2 for example app

    mmroz committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    a39b231 View commit details
    Browse the repository at this point in the history
  6. use 0.6.1 for Cash App Pay

    mmroz committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    25714c3 View commit details
    Browse the repository at this point in the history
  7. use version 2

    mmroz committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    53d047e View commit details
    Browse the repository at this point in the history
  8. Merge branch 'master' into markmroz/feature-button-master

    * master:
      docs: add checkout diagrams
    mmroz committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    ba3dd11 View commit details
    Browse the repository at this point in the history
  9. merged master

    mmroz committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    71e9b1d View commit details
    Browse the repository at this point in the history