Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
244 commits
Select commit Hold shift + click to select a range
c202d8d
updated module files to align with other better checkout modules
dean-smart Nov 27, 2024
16ab77d
Adding Circle CI
garymawdsley-gene Dec 3, 2024
9e90828
Adding the Circle CI status badge to the readme
garymawdsley-gene Dec 3, 2024
e4b71a9
Merge branch 'develop' into feature/composer-and-json-updates
garymawdsley-gene Dec 3, 2024
b6c88f9
Deleting the composer.lock file
garymawdsley-gene Dec 3, 2024
34432cd
Adding repositories to composer.json
garymawdsley-gene Dec 3, 2024
ef95cb4
Updating Circle CI status badge and module name in readme
garymawdsley-gene Dec 4, 2024
3434790
added paypal/paylater/messaging/venmo component on payment step
Nehaenko Dec 5, 2024
8210215
Merge pull request #3 from genecommerce/feature/composer-and-json-upd…
dean-smart Dec 9, 2024
8ffdcb3
added structure for card payment
Nehaenko Dec 9, 2024
0ce7209
added structure for venmo, paypal, card payments
Nehaenko Dec 10, 2024
671db0c
regenerated dist
Nehaenko Dec 10, 2024
13fc47b
Merge pull request #15 from genecommerce/feature/paypal-payments
Nehaenko Dec 10, 2024
aa15a1c
Update config.yml
garymawdsley-gene Dec 11, 2024
0a3c410
Merge pull request #16 from genecommerce/feature/improve_ci_perf
garymawdsley-gene Dec 11, 2024
fc22f01
Added graphQL session locking parameter to requests
maxparkergene Dec 11, 2024
3e2c78e
added fixes for payment methods after FED testing on env
Nehaenko Dec 12, 2024
61cbaca
added fixes for credit card 3ds unused validation
Nehaenko Dec 12, 2024
b460329
added empty line in layout file
Nehaenko Dec 12, 2024
4dcb49e
added fixes for clear cart js es lint errors
Nehaenko Dec 12, 2024
c08ad07
added availablity for paypal/venmo/card to save payment methods in ac…
Nehaenko Dec 12, 2024
29b513e
added fixes for eslint
Nehaenko Dec 12, 2024
c3820e1
added fix for lint errors in clear session functionality
Nehaenko Dec 12, 2024
0b6df93
Merge pull request #18 from genecommerce/bugfix/FED-test-payments
Nehaenko Dec 12, 2024
50f702a
added structure for the vaulted and fixed paypal on payment step
Nehaenko Dec 13, 2024
0084377
Merge pull request #19 from genecommerce/feature/vaulted-payments
Nehaenko Dec 13, 2024
6318d99
Ensure all graphQL operation names are unique
maxparkergene Dec 13, 2024
428ab74
Merge branch 'develop' of github.com:genecommerce/module-better-check…
maxparkergene Dec 13, 2024
fcac5b7
added card vaulted payment method
Nehaenko Dec 13, 2024
a0c54e5
removed virtualType as per comments on pr
Nehaenko Dec 16, 2024
0ef9379
Merge pull request #17 from genecommerce/feature/graphql-session-locking
garymawdsley-gene Dec 16, 2024
7963d5c
added paypal/venmo structure for vaulted methods
Nehaenko Dec 16, 2024
85b2fcb
resolve conflicts
Nehaenko Dec 16, 2024
f0d4fd8
Adding npm run build-watch workflow and github action
garymawdsley-gene Dec 16, 2024
d4310f0
Merge pull request #20 from genecommerce/feature/vaulted-payments
Nehaenko Dec 17, 2024
6345f20
added plugin to insert payment token id into response for PPCP
kieronthomas Dec 17, 2024
82e802f
Merge pull request #22 from genecommerce/feature/payment_token_id
Nehaenko Dec 17, 2024
55c883b
added enable/disabled checks for vaulted payments
Nehaenko Dec 17, 2024
6ca7156
Merge pull request #23 from genecommerce/feature/vaulted-payments
Nehaenko Dec 17, 2024
4b099e7
removed debug
kieronthomas Dec 17, 2024
3c69a53
Merge pull request #24 from genecommerce/feature/payment_token_id
Nehaenko Dec 17, 2024
490f028
added venmo vaulted / paypal vaulted part of functionality
Nehaenko Dec 17, 2024
ef930e1
added captcha elements for each payment method
Nehaenko Dec 17, 2024
92dbb4d
added captcha functionality
Nehaenko Dec 18, 2024
d6d6c1b
Merge pull request #25 from genecommerce/feature/paypal-venmo-vaulted
Nehaenko Dec 18, 2024
5b2c6c9
Merge pull request #21 from genecommerce/feature/automate-workflow
Nehaenko Dec 18, 2024
170be8b
paypal express working in bettercheckout with ppcp-web module
dean-smart Dec 19, 2024
e4a083d
removed redundant import and comment
dean-smart Dec 19, 2024
4cfa121
remove loaders when buttons appear
dean-smart Dec 19, 2024
b6e6edd
Merge pull request #27 from genecommerce/feature/ppcp-web-paypal-expr…
dean-smart Dec 19, 2024
adb08a4
google pay express integration with ppcp-web WIP, window keeps closin…
dean-smart Dec 20, 2024
c0071c0
Apple pay express integration with ppcp-web
dean-smart Dec 23, 2024
8b4fcf1
google pay express integration with ppcp-web, bugfix for window closi…
dean-smart Dec 23, 2024
fb9a7e4
updated id
dean-smart Dec 23, 2024
36c79ed
updated id
dean-smart Dec 23, 2024
41546fd
removed commented out code
dean-smart Dec 30, 2024
268a51a
only show div if apple pay is available
dean-smart Dec 30, 2024
65bc223
Merge pull request #28 from genecommerce/feature/ppcp-web-google-expr…
dean-smart Jan 2, 2025
c3447df
Merge pull request #29 from genecommerce/feature/ppcp-web-applepay-ex…
dean-smart Jan 2, 2025
00f92fe
paypal payments working in bettercheckout with ppcp-web module
dean-smart Jan 2, 2025
6495ca5
Merge pull request #30 from genecommerce/feature/ppcp-web-paypal-paym…
dean-smart Jan 2, 2025
3b76e25
added google pay functionality from ppcp-web and fixed lint errors
Nehaenko Jan 2, 2025
a966770
removed dist files
Nehaenko Jan 2, 2025
1fe337c
added fix for cls jump on express payments section
Nehaenko Jan 2, 2025
c0b0d9e
Merge pull request #31 from genecommerce/feature/payment-page-google-…
Nehaenko Jan 2, 2025
d41934b
venmo payment working in bettercheckout with ppcp-web module
dean-smart Jan 2, 2025
92e748f
Merge pull request #32 from genecommerce/feature/ppcp-web-venmo-integ…
dean-smart Jan 2, 2025
fb29449
added ppcp web to apple pay component on payment page
Nehaenko Jan 2, 2025
006ba4b
Merge pull request #33 from genecommerce/feature/apple-pay-payment-pa…
Nehaenko Jan 2, 2025
6f4f30e
added dist directory into ppcp branch
Nehaenko Jan 2, 2025
61395b5
added check for apple pay in created methods
Nehaenko Jan 2, 2025
1689128
removed changes
Nehaenko Jan 2, 2025
a6c7e1c
Merge pull request #34 from genecommerce/bugfix/apple-pay-browser-check
Nehaenko Jan 2, 2025
10807d6
card payments working in bettercheckout with ppcp-web module
dean-smart Jan 2, 2025
bd0710e
added dist files
dean-smart Jan 2, 2025
dae1492
Merge branch 'feature/ppcp-web-integration' into feature/ppcp-web-car…
dean-smart Jan 2, 2025
06860f3
Merge pull request #35 from genecommerce/feature/ppcp-web-card-paymen…
dean-smart Jan 3, 2025
5a39d2b
rebuild with latest changes from ppcp-web
Nehaenko Jan 3, 2025
9389ed5
removed onPaymentDataChanged callback to stop popup closing automatic…
dean-smart Jan 3, 2025
3605b90
Merge pull request #36 from genecommerce/bugfix/google-pay-auto-closing
dean-smart Jan 3, 2025
1c5b701
added config to show express based on ppcp show on top checkout config
Nehaenko Jan 6, 2025
043d919
added fix for clearing address issue on close of apple modal
Nehaenko Jan 6, 2025
e6da0b2
added fix for payment page apple pay place order with virtual product
Nehaenko Jan 6, 2025
bafa9f0
Merge pull request #37 from genecommerce/bugfix/apple-pay-qa
Nehaenko Jan 6, 2025
361c979
small fix to remove extra padding is no paypal
Nehaenko Jan 6, 2025
3ed2d5e
Merge pull request #38 from genecommerce/bugfix/apple-pay-qa
Nehaenko Jan 6, 2025
79540b7
added check for paypal/applepay enabled to render buttons
Nehaenko Jan 7, 2025
35502ae
Merge pull request #39 from genecommerce/bugfix/paypal-qa
Nehaenko Jan 7, 2025
348673f
added fix for applepay/googlepay not able save new address
Nehaenko Jan 7, 2025
0a1ae3b
Merge pull request #40 from genecommerce/bugfix/paypal-qa
Nehaenko Jan 7, 2025
fe22b4a
added fix for paypal vaulted
Nehaenko Jan 8, 2025
9d4ef8d
Merge pull request #41 from genecommerce/bugfix/paypal-qa
Nehaenko Jan 8, 2025
8af8e97
added ppcp-payment-icons
Nehaenko Jan 8, 2025
69e8a15
regenerated dist
Nehaenko Jan 8, 2025
043f7cf
resolving of conflicts
Nehaenko Jan 8, 2025
1563f05
conflict fixing
Nehaenko Jan 8, 2025
c3abbd2
Merge pull request #42 from genecommerce/feature/payment-icons-implem…
Nehaenko Jan 8, 2025
23e8db0
added minor fix for card styles
Nehaenko Jan 8, 2025
5b36f12
changed classes to ppcp
Nehaenko Jan 8, 2025
8e79f34
added small fix for card component
Nehaenko Jan 8, 2025
76cf5ee
Merge pull request #43 from genecommerce/feature/payment-icons-implem…
Nehaenko Jan 8, 2025
16ffb93
apm integration WIP
dean-smart Jan 9, 2025
a2dbf8f
amended ppcp apm allowed methods to return label value
kieronthomas Jan 9, 2025
f30cec1
amended to json object
kieronthomas Jan 9, 2025
f8c71ff
added fix for card payments build and styles
Nehaenko Jan 9, 2025
c80cbf6
added more error handling for card component
Nehaenko Jan 9, 2025
ced8af7
Merge pull request #44 from genecommerce/bugfix/card-payments
Nehaenko Jan 9, 2025
0497461
added small fix for styles/added error message into component
Nehaenko Jan 9, 2025
6876539
rebuilded card component
Nehaenko Jan 9, 2025
778c797
Merge pull request #45 from genecommerce/bugfix/card-payments
Nehaenko Jan 9, 2025
8fad9c7
added this.errorMessage into card component for not valid card
Nehaenko Jan 9, 2025
16d3f91
merged BE changes to allowed payments
dean-smart Jan 9, 2025
604bba2
FE fixes to work with new allowed methods from backend
dean-smart Jan 9, 2025
5fa5dd8
added fix for paypal pay later qa feedback
Nehaenko Jan 10, 2025
464fa87
Merge pull request #46 from genecommerce/bugfix/paylater-qa
Nehaenko Jan 10, 2025
ba0a15b
Remove private dependenices / stub out ppcp
convenient Dec 19, 2024
354776d
working APM payments component
dean-smart Jan 10, 2025
902f7fa
added couple of fixes for paylater messaging
Nehaenko Jan 10, 2025
c89b579
regenerated dist
Nehaenko Jan 10, 2025
aec7e77
Merge pull request #48 from genecommerce/bugfix/paylater-qa
Nehaenko Jan 10, 2025
d94f62f
Merge branch 'feature/ppcp-web-integration' into feature/ppcp-web-apm…
dean-smart Jan 10, 2025
f413513
Merge pull request #49 from genecommerce/feature/ppcp-web-apm-payment…
dean-smart Jan 10, 2025
4d5b94e
removed unused file
dean-smart Jan 10, 2025
a8e9ae7
Merge pull request #50 from genecommerce/bugfix/removed-unused-file
dean-smart Jan 13, 2025
131d0b4
added logic to not render buttons that are not eligible and also remo…
dean-smart Jan 13, 2025
9933ffd
Merge pull request #51 from genecommerce/bugfix/non-eligible-button-r…
dean-smart Jan 13, 2025
24e8bea
added fixes for googlepay qa
Nehaenko Jan 17, 2025
acb9b30
small fix for vaulted long emails
Nehaenko Jan 17, 2025
0ea5b6f
small fix for saved paypal venmo logos
Nehaenko Jan 17, 2025
b93b12e
added fix for vertical scroll for vaulted
Nehaenko Jan 17, 2025
6bbc981
Merge pull request #52 from genecommerce/bugfix/google-pay-qa
Nehaenko Jan 17, 2025
be5d696
recapture fixes for APM
dean-smart Jan 17, 2025
ab56f7f
Merge branch 'feature/ppcp-web-integration' into bugfix/apm-recapture
dean-smart Jan 17, 2025
8635c6a
Merge pull request #53 from genecommerce/bugfix/apm-recapture
Nehaenko Jan 17, 2025
aea9eca
hide ideal on mobile devices
dean-smart Jan 20, 2025
5daf7cd
Merge pull request #56 from genecommerce/bugfix/hide-ideal-on-mobile
dean-smart Jan 21, 2025
567f442
added fix for express payments sort order
Nehaenko Jan 21, 2025
026a472
resolved conflicts
Nehaenko Jan 21, 2025
3becc88
added sort order for apm
Nehaenko Jan 21, 2025
f986017
removed dymmy test from apm component
Nehaenko Jan 21, 2025
427b0af
render apm only if enabled
Nehaenko Jan 21, 2025
6e71b29
added fix for lint errors and for vaulted styles
Nehaenko Jan 21, 2025
d4669d5
Merge pull request #57 from genecommerce/bugfix/apm-qa
Nehaenko Jan 22, 2025
cf77fff
rebuild dist
Nehaenko Jan 22, 2025
e7cf686
rebuild
dean-smart Jan 22, 2025
ef11c7b
Merge pull request #58 from genecommerce/bugfix/rebuild
dean-smart Jan 22, 2025
8ca84c6
build develop*
convenient Jan 23, 2025
6bb059d
Merge remote-tracking branch 'origin/test-ppcp' into develop-bluefinch
convenient Jan 23, 2025
2ebc6be
Begin rename to bluefinch
convenient Jan 23, 2025
4c9c686
empty error messaging on change
dean-smart Jan 24, 2025
331a834
Merge pull request #60 from genecommerce/bugfix/card-payments-error-m…
dean-smart Jan 24, 2025
43cca9e
updated styles to cater for long emails
dean-smart Jan 28, 2025
cf363fe
Merge pull request #61 from genecommerce/feature/vaulted-payments-tex…
dean-smart Jan 28, 2025
5706ab0
added dist files
dean-smart Jan 30, 2025
e2c243a
Merge pull request #62 from genecommerce/feature/vaulted-payments-tex…
maxparkergene Jan 30, 2025
e6369db
Merge branch 'feature/ppcp-web-integration' into rename-to-bluefinch
Nehaenko Feb 4, 2025
afd8900
renamed ppcp module from gene better checkout to bluefinch checkout
Nehaenko Feb 4, 2025
4c27ffb
Update config.yml
convenient Feb 4, 2025
9196497
Add PPCP stub
convenient Feb 4, 2025
3d38e02
Merge pull request #59 from genecommerce/rename-to-bluefinch
convenient Feb 4, 2025
4342e2d
[bot] generate dist (https://github.com/genecommerce/module-better-ch…
Feb 4, 2025
31cdd7b
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 4, 2025
7dcf87f
added new logic and files for pipeline
Nehaenko Feb 4, 2025
4e01bd8
Delete view/frontend/web/js/checkout/.npmrc
Nehaenko Feb 4, 2025
dfe8360
Update config.yml
Nehaenko Feb 4, 2025
f950a24
Update generate-dist.yml
Nehaenko Feb 4, 2025
bf11a3b
Update generate-dist.yml
Nehaenko Feb 4, 2025
89cf560
changes for ppcp-web
Nehaenko Feb 4, 2025
b966fa4
npm ci to npm i
Nehaenko Feb 4, 2025
f099863
clear packadge lock
Nehaenko Feb 4, 2025
6f21603
added verbose
Nehaenko Feb 4, 2025
cd5d090
added npm i for rollup-plugin-multi-input
Nehaenko Feb 4, 2025
2a2e0eb
ci pipeline test
Nehaenko Feb 4, 2025
8beb08b
ci pipeline test
Nehaenko Feb 4, 2025
9331795
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 4, 2025
bb38f9c
lint errors potential fix
Nehaenko Feb 4, 2025
5decfe7
resolved conflicts
Nehaenko Feb 4, 2025
9707675
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 4, 2025
7454ba5
added ignore ppcp-web lint
Nehaenko Feb 4, 2025
b0580a1
added lint ignore
Nehaenko Feb 4, 2025
6f2fac8
removed toor module linting
Nehaenko Feb 4, 2025
d9b9f40
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 4, 2025
957355d
removed package-lock.json in the ci pipeline
Nehaenko Feb 4, 2025
6677a44
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 4, 2025
66cbe05
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 4, 2025
086c63b
added more debug steps for ci config
Nehaenko Feb 4, 2025
34ee5e5
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 4, 2025
cbab8e4
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 4, 2025
8b0e036
added link functionality
Nehaenko Feb 4, 2025
abefd82
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 4, 2025
ab1597a
ci config change
Nehaenko Feb 4, 2025
8d1eec5
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 4, 2025
6279339
ci config change
Nehaenko Feb 4, 2025
d6fe7bf
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 4, 2025
4a38be2
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 4, 2025
ec8c209
change for ci file
Nehaenko Feb 4, 2025
7a9344a
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 4, 2025
4926ddb
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 4, 2025
974e464
added change to config yml file
Nehaenko Feb 4, 2025
9813f23
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 4, 2025
b0fddfd
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 4, 2025
ec29fbd
added changes to the ci config file
Nehaenko Feb 5, 2025
5a2f00d
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 5, 2025
8b932bf
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 5, 2025
ab3af37
changed config file
Nehaenko Feb 5, 2025
836a38b
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 5, 2025
cc4dda5
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 5, 2025
3ade063
config file change
Nehaenko Feb 5, 2025
cc34570
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 5, 2025
bc25068
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 5, 2025
0d4b9a3
config file change
Nehaenko Feb 5, 2025
d2679b8
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 5, 2025
6a14f35
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 5, 2025
d5bf2f7
change in config file
Nehaenko Feb 5, 2025
24b5819
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 5, 2025
7adece4
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 5, 2025
2b237be
change in config file
Nehaenko Feb 5, 2025
4aa8337
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 5, 2025
05bedd1
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 5, 2025
9a3e87a
config change
Nehaenko Feb 5, 2025
c211547
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 5, 2025
90fe32c
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 5, 2025
3c18084
removed todo actions
Nehaenko Feb 6, 2025
b81843e
Merge branch 'feature/ppcp-web-ci-pipeline' of github.com:BlueFinchCo…
Nehaenko Feb 6, 2025
c12ae9d
Merge pull request #1 from BlueFinchCommerce/feature/ppcp-web-ci-pipe…
Nehaenko Feb 6, 2025
1f461c0
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 6, 2025
3d5a1de
Adding further checkout migration renaming amends
garymawdsley-gene Feb 6, 2025
edd7bb0
Merge pull request #2 from BlueFinchCommerce/feature-module-migration…
garymawdsley-gene Feb 6, 2025
acd33a6
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 6, 2025
b6b2c82
Removing the version from the composer install instruction in the readme
garymawdsley-gene Feb 6, 2025
a658796
Merge pull request #3 from BlueFinchCommerce/feature-readme-composer-…
Nehaenko Feb 7, 2025
97de9e0
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 7, 2025
014478d
fixed typo on layout name
Nehaenko Feb 7, 2025
6fa3fa5
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 7, 2025
99217de
changed package name for ppcp-web
Nehaenko Feb 7, 2025
6a56c43
small change in ci config
Nehaenko Feb 7, 2025
05fff1e
renamed ppcp-web to blufinch-ppcp-web
Nehaenko Feb 7, 2025
697b9be
Merge pull request #4 from BlueFinchCommerce/feature/ppcp-package-nam…
Nehaenko Feb 7, 2025
95387e9
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 7, 2025
8c122b9
Fixing typo in the ppcp web package name
garymawdsley-gene Feb 11, 2025
ace95d4
Merge pull request #6 from BlueFinchCommerce/feature/fix-typo-in-ppcp…
garymawdsley-gene Feb 11, 2025
3d9a392
[bot] generate dist (https://github.com/BlueFinchCommerce/module-chec…
Feb 11, 2025
5f0b71f
Amending the partnerAttributionId
garymawdsley-gene Feb 11, 2025
43bf9f0
Merge pull request #7 from BlueFinchCommerce/feature/amend-partnerAtt…
garymawdsley-gene Feb 11, 2025
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
172 changes: 172 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
version: 2.1
jobs:
build:
docker:
- image: cimg/php:8.3-browsers
- image: cimg/mariadb:10.6
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: m2build
- image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0
environment:
transport.host: 127.0.0.1
network.host: 127.0.0.1
http.port: 9200
cluster.name: es-cluster
discovery.type: single-node
xpack.security.enabled: "false"
ES_JAVA_OPTS: "-Xms256m -Xmx256m"
steps:
- checkout
- run:
name: Create magento2 working directory
command: |
mkdir -p ~/magento2
- run:
name: Waiting for MySQL startup
command: |
for i in `seq 1 20`;
do
nc -z 127.0.0.1 3306 && echo Success && exit 0
echo -n .
sleep 1
done
echo MySQL failed to start && exit 1
- run:
name: Wait for ES startup
command: dockerize -wait tcp://localhost:9200 -timeout 30s
- run:
name: Install System Packages
command: |
sudo apt-get update -y && sudo apt-get install -y \
cron \
git \
gzip \
libbz2-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
libmcrypt-dev \
libonig-dev \
libpng-dev \
libsodium-dev \
libssh2-1-dev \
libxslt1-dev \
libzip-dev \
lsof \
default-mysql-client \
vim \
zip \
zlib1g-dev \
sendmail \
procps \
nginx
- run:
name: Install PHP Packages
command: |
sudo docker-php-ext-install \
sysvshm \
xsl
sudo composer self-update
composer config --global github-oauth.github.com $GITHUB_CHECKOUT_TOKEN
composer config -g allow-plugins true
- run:
working_directory: ~/magento2
name: Composer Create Project
command: php -d memory_limit=-1 /usr/local/bin/composer create-project --no-interaction --repository-url=https://mirror.mage-os.org/ magento/project-community-edition=2.4.7 .
- run:
working_directory: ~/magento2
name: Install Module @ CI Build Branch/Commit
command: |
REPODIR=$(realpath ~/project)
composer config "repositories.1" "{\"type\": \"path\", \"canonical\":true, \"url\": \"$REPODIR\", \"options\": {\"symlink\":false}}"
composer config "repositories.2" "{\"type\": \"path\", \"canonical\":true, \"url\": \"$REPODIR/dev/composerstub/ppcp\"}"
composer config "repositories.3" "{\"type\": \"vcs\", \"url\": \"https://github.com/bluefinchcommerce/module-checkout\"}"
composer config minimum-stability dev
composer config prefer-stable true
composer require bluefinchcommerce/module-checkout-ppcp:dev-${CIRCLE_BRANCH} --no-interaction
- run:
name: Install Magento
working_directory: ~/magento2
command: |
php -d memory_limit=-1 bin/magento setup:install \
--base-url=http://m2build.test/ \
--db-host=127.0.0.1 \
--db-name=m2build \
--db-user=root \
--db-password=root \
--admin-firstname=Admin \
--admin-lastname=User \
--admin-email=admin@bluefinchcommerce.co.uk \
--admin-user=admin \
--admin-password=password1 \
--language=en_GB \
--currency=GBP \
--timezone=Europe/London \
--cleanup-database \
--sales-order-increment-prefix="ORD$" \
--session-save=db \
--use-rewrites=1 \
--search-engine=elasticsearch7 \
--elasticsearch-host=127.0.0.1 \
--elasticsearch-port=9200 \
--elasticsearch-enable-auth=0 \
--elasticsearch-index-prefix="local" \
--elasticsearch-timeout=15
- run:
working_directory: ~/magento2
name: DI Compile
command: php -d memory_limit=-1 bin/magento setup:di:compile
- run:
working_directory: ~/magento2/vendor/bluefinchcommerce/module-checkout-ppcp
name: Install composer modules within BlueFinch Checkout
command: |
composer install --no-interaction
- run:
name: PHPCS
working_directory: ~/magento2/vendor/bluefinchcommerce/module-checkout-ppcp
command: |
./vendor/bin/phpcs . --standard=Magento2 --ignore=vendor,*.css,Test --extensions=php --colors -s -p -v --runtime-set installed_paths vendor/magento/magento-coding-standard,vendor/magento/php-compatibility-fork
- run:
name: PHPStan
working_directory: ~/magento2/vendor/bluefinchcommerce/module-checkout-ppcp
command: ./vendor/bin/phpstan analyse . --configuration=./phpstan.neon
- run:
name: Configure PHPunit
working_directory: ~/magento2/vendor/bluefinchcommerce/module-checkout-ppcp
command: |
mkdir -p ~/phpunit
- run:
name: PHPUnit
working_directory: ~/magento2/vendor/bluefinchcommerce/module-checkout-ppcp
command: ./vendor/bin/phpunit -c phpunit.xml
- run:
working_directory: ~/magento2/vendor/bluefinchcommerce/module-checkout-ppcp/view/frontend/web/js/checkout
name: Clone bluefinch-ppcp-web
command: |
git clone https://x-access-token:$GH_PAT@github.com/BlueFinchCommerce/ppcp-web.git bluefinch-ppcp-web
- run:
name: NPM install to root module
working_directory: ~/magento2
command: npm --prefix vendor/bluefinchcommerce/module-checkout-ppcp i
- run:
name: NPM install to checkout app
working_directory: ~/magento2
command: npm --prefix vendor/bluefinchcommerce/module-checkout-ppcp/view/frontend/web/js/checkout i
- run:
name: npm install ./bluefinch-ppcp-web
working_directory: ~/magento2/vendor/bluefinchcommerce/module-checkout-ppcp/view/frontend/web/js/checkout
command: npm install ./bluefinch-ppcp-web
- run:
name: ESLint run against checkout app
working_directory: ~/magento2/vendor/bluefinchcommerce/module-checkout-ppcp/view/frontend/web/js/checkout
command: npm run lint
- run:
name: Run build for checkout app
working_directory: ~/magento2
command: npm --prefix vendor/bluefinchcommerce/module-checkout-ppcp/view/frontend/web/js/checkout run build
workflows:
build-test:
jobs:
- build:
context: bluefinch checkout extension
5 changes: 5 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Ignore the Checkout app.
view/frontend/web/js/checkout/*

# Ignore composer files
vendor/
4 changes: 4 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
extends: './vendor/magento/magento-coding-standard/eslint/.eslintrc',
root: true
};
15 changes: 15 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Local workflow

When you install the module it will be able to read from the generated `dist` but for making change it is best to use the `watch` functionality.

Turn on support for vite watch in the admin panel or by using magerun
- `BlueFinch -> Checkout -> General -> Enable local developer vite watch mode = yes`
- `n98-magerun config:store:set bluefinch_checkout/general/enable_local_developer_vite_watch_mode=1`

```bash
cd view/frontend/web/js/checkout/ # or view/adminhtml/web/js/checkout/
npm ci
npm run build-watch
```

This will populate `view/frontend/web/js/checkout/dist-dev` for use, allowing you to make changes and have them quickly visible on the frontend.
7 changes: 7 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<!--

Do not commit any changes to the `view/frontend/web/js/checkout/dist` directory

See .github/CONTRIBUTING.md for local workflow recommendations

-->
55 changes: 55 additions & 0 deletions .github/workflows/generate-dist.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Generate dist

on:
push:
branches:
- main
- "develop*"
- "hotfix/*"

jobs:
generate-dist:
runs-on: ubuntu-latest

steps:

- name: Prepare git
shell: bash
run: |
git config --global user.name "github-action[bot]"
git config --global user.email "github-action[bot]@users.noreply.github.com"

- name: Check out the src branch
uses: actions/checkout@v3
with:
ref: ${{ github.ref_name }}

- name: Generate dist
shell: bash
run: |
set -v

git config --global pull.rebase false
git fetch --unshallow || true

cd view/frontend/web/js/checkout/

echo "cloning bluefinch-ppcp-web until it is made public"
git clone https://x-access-token:${{ secrets.GH_PPCP_WEB_PAT }}@github.com/BlueFinchCommerce/ppcp-web.git

npm i rollup
npm i
npm run build
git add -f ./dist

git status

if ! git diff-index --quiet HEAD; then
echo "Adding changes to git"
git commit -am "[bot] generate dist ($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)"
git push
else
echo "exiting"
exit 0;
fi

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.idea
.DS_STORE
vendor
node_modules
53 changes: 53 additions & 0 deletions Model/Resolver/PpcpApmConfig.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?php
declare(strict_types=1);

namespace BlueFinch\CheckoutPPCP\Model\Resolver;

use Magento\Framework\GraphQl\Config\Element\Field;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
use Magento\Framework\App\Config\ScopeConfigInterface;
use PayPal\PPCP\Model\ConfigProvider;
use PayPal\PPCP\Model\Adminhtml\Source\ApmMethods;

class PpcpApmConfig implements ResolverInterface
{
/**
* @param ScopeConfigInterface $scopeConfig
* @param ConfigProvider $payPalConfigProvider
* @param ApmMethods $apmMethods
*/
public function __construct(
private readonly ScopeConfigInterface $scopeConfig,
private readonly ConfigProvider $payPalConfigProvider,
private readonly ApmMethods $apmMethods
) {
}

/**
* @inheritdoc
*/
public function resolve(
Field $field,
$context,
ResolveInfo $info,
array $value = null,
array $args = null
) {
try {
$apmAllowedMethods = explode(',', $this->payPalConfigProvider->getAllowedPaymentMethod());
$methods = [];
$apmMethods = $this->apmMethods->toOptionArray();
foreach ($apmMethods as $option) {
if (in_array($option['value'], $apmAllowedMethods)) {
$methods[] = $option;
}
}
return json_encode($methods);
} catch (GraphQlNoSuchEntityException $exception) {
throw new GraphQlNoSuchEntityException(__($exception->getMessage()));
}
}
}
56 changes: 56 additions & 0 deletions Plugin/Resolver/PaymentTokens.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?php
declare(strict_types=1);

namespace BlueFinch\CheckoutPPCP\Plugin\Resolver;

use Magento\Framework\GraphQl\Config\Element\Field;
use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
use Magento\GraphQl\Model\Query\ContextInterface;
use Magento\Vault\Model\PaymentTokenManagement;
use Magento\VaultGraphQl\Model\Resolver\PaymentTokens as Subject;
use PayPal\PPCP\Model\ConfigProvider;

class PaymentTokens
{
/**
* @param ConfigProvider $configProvider
*/
public function __construct(
private readonly PaymentTokenManagement $paymentTokenManagement,
private readonly ConfigProvider $configProvider
) {}

public function aroundResolve(
Subject $subject,
callable $proceed,
Field $field,
$context,
ResolveInfo $info,
array $value = null,
array $args = null
) {
if (!$this->configProvider->isExtensionActive()) {
return $proceed($field, $context, $info, $value, $args);
} else {
/** @var ContextInterface $context */
if (false === $context->getExtensionAttributes()->getIsCustomer()) {
throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
}

$tokens = $this->paymentTokenManagement->getVisibleAvailableTokens($context->getUserId());
$result = [];

foreach ($tokens as $token) {
$result[] = [
'id' => $token->getEntityId(),
'public_hash' => $token->getPublicHash(),
'payment_method_code' => $token->getPaymentMethodCode(),
'type' => $token->getType(),
'details' => $token->getTokenDetails(),
];
}
return ['items' => $result];
}
}
}
Loading