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

fix(checkout): fix incorrect shipping price being used in checkout #272

Merged
merged 7 commits into from
Sep 26, 2024

Conversation

FlorianSDV
Copy link
Contributor

@FlorianSDV FlorianSDV commented Sep 18, 2024

INT-650

@myparcel-bot
Copy link
Contributor

myparcel-bot bot commented Sep 18, 2024

PDK upgrade summary

The following packages were upgraded:

Package Old version New version
myparcelnl/pdk 2.42.0 2.43.2

@myparcel-bot
Copy link
Contributor

myparcel-bot bot commented Sep 18, 2024

✅ Build successful!

You can find a link to the downloadable artifact below.

Name Link
Commit 45c7674
Logs https://github.com/myparcelnl/prestashop/actions/runs/11030440936
Download https://github.com/myparcelnl/prestashop/suites/28821723322/artifacts/1976065072

Copy link

codecov bot commented Sep 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.02%. Comparing base (c4d3330) to head (45c7674).
Report is 29 commits behind head on beta.

Additional details and impacted files
@@              Coverage Diff              @@
##               beta     #272       +/-   ##
=============================================
+ Coverage     46.92%   75.02%   +28.09%     
+ Complexity      582      560       -22     
=============================================
  Files           148       93       -55     
  Lines          3676     2210     -1466     
  Branches         55        0       -55     
=============================================
- Hits           1725     1658       -67     
+ Misses         1896      552     -1344     
+ Partials         55        0       -55     
Flag Coverage Δ
admin ?
backend 75.02% <100.00%> (-0.54%) ⬇️
checkout ?
frontend ?
unit 75.02% <100.00%> (+28.09%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@EdieLemoine EdieLemoine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

graag even je titel herzien, is nogal omslachtig :P

src/Hooks/HasPsShippingCostHooks.php Outdated Show resolved Hide resolved
src/Hooks/HasPsShippingCostHooks.php Outdated Show resolved Hide resolved
src/Hooks/HasPsShippingCostHooks.php Outdated Show resolved Hide resolved
src/Hooks/HasPsShippingCostHooks.php Outdated Show resolved Hide resolved
@myparcel-bot myparcel-bot bot added the changes requested (Auto) label Sep 19, 2024
@FlorianSDV FlorianSDV changed the title fix(checkout): fix problem that prevents pickup price from being taken into consideration fix(checkout): fix incorrect shipping price being used in checkout Sep 19, 2024
@FlorianSDV FlorianSDV marked this pull request as ready for review September 23, 2024 07:03
@FlorianSDV FlorianSDV requested a review from a team as a code owner September 23, 2024 07:03
@myparcel-bot myparcel-bot bot removed the changes requested (Auto) label Sep 25, 2024
@myparcel-bot myparcel-bot bot added the approved (Auto) label Sep 25, 2024
@myparcel-bot myparcel-bot bot force-pushed the fix/show-pickup-price-during-payment-step branch from a0054a6 to b929743 Compare September 25, 2024 09:37
@myparcel-bot myparcel-bot bot force-pushed the fix/show-pickup-price-during-payment-step branch from b929743 to 45c7674 Compare September 25, 2024 09:39
@FlorianSDV FlorianSDV added this pull request to the merge queue Sep 26, 2024
Merged via the queue into beta with commit eebdfd5 Sep 26, 2024
6 of 7 checks passed
@FlorianSDV FlorianSDV deleted the fix/show-pickup-price-during-payment-step branch September 26, 2024 14:03
myparcel-bot bot added a commit that referenced this pull request Oct 16, 2024
## [4.0.0](v3.10.0...v4.0.0) (2024-10-16)

### ⚠ BREAKING CHANGES

* implement pdk

### 🐛 Bug Fixes

* **account:** fix carrier mapping constraint error on account update ([21eb32f](21eb32f))
* **admin:** fix all inputs appearing as required ([142f9f9](142f9f9))
* **admin:** fix broken import ([0c1c1ad](0c1c1ad))
* **admin:** fix error on pages without bulk actions ([9960cee](9960cee))
* **admin:** fix scripts ([9c4ef00](9c4ef00))
* **admin:** improve product settings appearance ([5682b73](5682b73))
* **admin:** improve product settings form ([84714ce](84714ce))
* **admin:** improve tri state input appearance ([d8186c7](d8186c7))
* **admin:** remove required indicators from inputs ([3e5bff7](3e5bff7))
* **admin:** update components ([8e73009](8e73009))
* **carriers:** add carrier migration and improve logic ([7e08891](7e08891))
* **carrier:** set human as name instead of identifier ([c040806](c040806))
* **carriers:** fix carriers and payment methods not being linked ([2228f71](2228f71))
* **carriers:** update carrier creation logic ([dee2d3f](dee2d3f))
* **carriers:** update default values ([63d3077](63d3077))
* **cart:** use correct value for country ([#263](#263)) ([7fb25cc](7fb25cc))
* **checkout:** do not load delivery options script if it's disabled ([713f566](713f566))
* **checkout:** fix delivery options not loading in ps 1.7 ([#270](#270)) ([11c6a46](11c6a46))
* **checkout:** fix incorrect shipping price being used in checkout ([#272](#272)) ([eebdfd5](eebdfd5))
* **checkout:** fix saving delivery options to cart ([64e9e86](64e9e86))
* **checkout:** improve delivery options logic ([6d3fa93](6d3fa93))
* **checkout:** remove missing style.css error ([a382771](a382771))
* **checkout:** retain specific configs when switching carriers ([3d3c223](3d3c223))
* **checkout:** update checkout ([7714efd](7714efd))
* **checkout:** update checkout hooks ([0297ce0](0297ce0))
* **core:** improve core module error handling ([b15ed15](b15ed15))
* **database:** allow creating index to fail if sql functionality is not supported ([6550654](6550654))
* **database:** fix creating indexes on certain db drivers ([fbbc611](fbbc611))
* **database:** fix database indexes and keys ([5ddb09d](5ddb09d))
* **database:** only create indexes if they do not exist ([33b89fd](33b89fd))
* **deps:** upgrade myparcelnl/pdk to v2.30.3 ([26c6bc5](26c6bc5))
* **deps:** upgrade myparcelnl/pdk to v2.30.4 ([217c239](217c239))
* **deps:** upgrade myparcelnl/pdk to v2.31.2 ([2309ea4](2309ea4))
* **entity:** update entities ([5d415e8](5d415e8))
* fix di container in production mode ([49874fc](49874fc))
* fix error when exception has no previous exception ([#260](#260)) ([68f051f](68f051f))
* fix error when loading webhook subscriptions ([7fab71c](7fab71c))
* fix namespace error when installing module ([#246](#246)) ([cf3c9e4](cf3c9e4)), closes [#242](#242)
* fix path to log directory ([0bef829](0bef829))
* fix php errors ([8ab2f49](8ab2f49))
* **fulfilment:** add order notes ([e14fa32](e14fa32))
* improve entities ([275265e](275265e))
* improve entities and carrier logic ([b61d197](b61d197))
* improve installation logging ([056aca4](056aca4))
* improve stability of installation flow ([8db8654](8db8654))
* include state code in address for ups ([#276](#276)) ([e89a2f5](e89a2f5))
* increase max ps version to 8.2 ([ffb2732](ffb2732))
* install module tab correctly ([19d3b33](19d3b33))
* **installer:** clear sf2 cache on install ([533cda0](533cda0))
* **installer:** fix prestashop context error on install ([003ca3b](003ca3b))
* **installer:** prepare the ps entity manager before starting ([016c9ee](016c9ee))
* **installer:** properly delete account on uninstall ([bdf1d3a](bdf1d3a))
* **installer:** save the installed version to database ([3f067f0](3f067f0))
* **install:** fix upgrading from older versions ([#245](#245)) ([ae3b626](ae3b626)), closes [#243](#243)
* **logger:** fix logger ([3ef0b51](3ef0b51))
* **logging:** improve logging ([0caa9ef](0caa9ef))
* **logging:** include context in logs ([fc0723e](fc0723e))
* **logging:** update log format ([e015767](e015767))
* **migration:** fix db constraint errors in migrations ([7ebc855](7ebc855))
* **migration:** fix errors when invalid db data is returned ([#252](#252)) ([00bc56e](00bc56e))
* **migration:** fix type error ([12f4fad](12f4fad))
* **migration:** fix type error in product settings migration ([a7a32b2](a7a32b2)), closes [#235](#235)
* **migration:** fix type error when input is not an array ([#262](#262)) ([d40d6df](d40d6df))
* **migration:** harden error handling ([b75d277](b75d277))
* **migration:** improve order shipments migration ([f6f3b5e](f6f3b5e))
* **migration:** improve settings migration ([cc9e21c](cc9e21c))
* **migration:** improve settings migration ([2aa8da9](2aa8da9))
* **migration:** migrate migrations ([0263e9f](0263e9f))
* **migration:** prevent $row must be array but bool supplied during installation ([#241](#241)) ([b655806](b655806))
* **migration:** run migrations when upgrading ([7534da7](7534da7))
* **migrations:** improve migrations ([148fceb](148fceb))
* **migration:** update and test shipments migration ([f0f33ca](f0f33ca))
* **module:** move settings to dedicated page ([138ed5c](138ed5c))
* **order:** fix errors caused by missing dates ([54bfc96](54bfc96))
* **order:** fix saving data to orders ([cb3dbd9](cb3dbd9))
* **orders:** fix error when weight is a string ([#261](#261)) ([9e844a2](9e844a2)), closes [#256](#256)
* **orders:** move order note logic to order note repository ([9b83b32](9b83b32))
* **orders:** prevent order id type error ([e59ab3c](e59ab3c))
* **orders:** reset index on collection ([5e92f23](5e92f23))
* **orders:** throw error on getting nonexistent order ([f0921ee](f0921ee))
* **orders:** trim whitespace in person field ([2ab31a4](2ab31a4))
* pass dev mode to bootstrapper ([ca5d58b](ca5d58b))
* prevent integrity constraint violation for notes column ([#259](#259)) ([53c5eab](53c5eab))
* **products:** fix product settings logic and migration ([96734a1](96734a1))
* **products:** fix saving product settings ([b6e3c89](b6e3c89))
* **products:** improve handling of nonexistent products ([#229](#229)) ([efd8483](efd8483)), closes [#228](#228)
* remove deprecation warning ([ade1951](ade1951))
* **scripts:** improve script loading logic ([878403a](878403a))
* **settings:** improve saving settings ([b313793](b313793))
* **settings:** remove settings that aren't available ([d413ff1](d413ff1))
* **upgrade:** fix reference to facade class ([b580ffb](b580ffb))
* **webhooks:** fix webhooks ([dad3abc](dad3abc))

### ✨ New Features

* **admin:** improve admin component appearance ([e97ccc3](e97ccc3))
* **admin:** improve look of components ([2df8009](2df8009))
* **carriers:** add carrier logos ([1ae56e6](1ae56e6))
* **carriers:** allow changing name and delivery speed texts ([ea19255](ea19255))
* **checkout:** calculate shipping costs per carrier ([e03a380](e03a380))
* **deps:** upgrade @myparcel-pdk/* ([781600d](781600d))
* **deps:** upgrade @myparcel-pdk/* ([687ecb3](687ecb3))
* **deps:** upgrade @myparcel-pdk/* ([86a1c1c](86a1c1c))
* **deps:** upgrade @myparcel-pdk/* ([2c88f49](2c88f49))
* **deps:** upgrade @myparcel-pdk/* ([36cdc62](36cdc62))
* **deps:** upgrade myparcelnl/pdk to v2.30.2 ([885ead1](885ead1))
* **deps:** upgrade myparcelnl/pdk to v2.31.0 ([f830d7b](f830d7b))
* **deps:** upgrade myparcelnl/pdk to v2.33.2 ([1bd9d5d](1bd9d5d))
* **deps:** upgrade myparcelnl/pdk to v2.36.2 ([a1a9a57](a1a9a57))
* **deps:** upgrade myparcelnl/pdk to v2.42.0 ([d3f1a78](d3f1a78))
* **deps:** upgrade myparcelnl/pdk to v2.43.5 ([f9b206d](f9b206d))
* **frontend:** allow html in form descriptions ([#257](#257)) ([1251164](1251164))
* **fulfilment:** add order notes ([ae98602](ae98602))
* implement pdk ([c497eb8](c497eb8))
* **logging:** improve logging output ([861e713](861e713))
* **order-grid:** add bulk order actions ([53b2a63](53b2a63))
* **order:** implement updating order notes ([935955d](935955d))
* **orders:** implement automatic order status updates ([9af8725](9af8725))
* **settings:** enable/disable carriers based on settings ([7f558a4](7f558a4))
* **settings:** implement shipping method repository ([045a668](045a668))
* support prestashop 1.7 ([#239](#239)) ([b16926c](b16926c)), closes [#232](#232)
* update to latest delivery options ([#240](#240)) ([82064fa](82064fa))
* upgrade to delivery options v6.x ([35d2b05](35d2b05))
@myparcel-bot
Copy link
Contributor

myparcel-bot bot commented Oct 16, 2024

🎉 This PR is included in version 4.0.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants