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

5.5.1 release #52

Merged
merged 31 commits into from
Jul 1, 2021
Merged

5.5.1 release #52

merged 31 commits into from
Jul 1, 2021

Conversation

tc-hugo
Copy link
Contributor

@tc-hugo tc-hugo commented Jul 1, 2021

No description provided.

tc-hugo and others added 30 commits April 7, 2021 13:17
@tc-hugo
wrap parent into calculateDeliveryCost
08a7d9e
@tc-hugo
Remove instant shopping
30b433d
@tc-hugo
On order management in admin use the order item price instwad of the …
b575b45 
…article price to prevent differences on prices if the original product got a price update.

https://trello.com/c/3os3bPfC
@tc-hugo
On order management in admin use the order item price instead of the …
c12c561 
…article price to prevent differences on prices if the original product got a price update.

https://trello.com/c/3os3bPfC
@ksojsann @tc-hugo
Backend rebranding
39cf6f9
@tc-hugo
Update documentation
dfc469d
@tc-hugo
v5.5.0
af48413
@tc-hugo
v5.5.0
6eceba6
@tc-hugo
Merge branch 'development' into 'master'
73ac65f 
v5.5.0

See merge request cgrd/customer-projects/klarna/OXID-Klarna-6!46
@ksojsann @tc-hugo
Backend rebranding
6b83bf6
@tc-hugo
Merge branch 'development' into 'master'
be4463a 
5.5.0

See merge request cgrd/customer-projects/klarna/OXID-Klarna-6!47
@tc-hugo
Merge branch 'master' of git.topconcepts.com:cgrd/customer-projects/k…
56faaa6 
…larna/oxid-klarna-6
@tc-hugo
Update documentation
30823b2 
(cherry picked from commit dfc469d)
@tc-hugo
v5.5.0
5d33d03 
(cherry picked from commit af48413)
@tc-hugo
v5.5.0 fix start page
896dd04
@tc-hugo
Merge branch 'development' into 'master'
337c855 
v5.5.0 fix start page

See merge request cgrd/customer-projects/klarna/OXID-Klarna-6!48
@tc-hugo
v5.5.0 fix start page
120a2b8 
(cherry picked from commit 896dd04)
@tc-hugo
Merge branch 'master' of https://github.com/topconcepts/OXID-Klarna-6 …
d7ac05d 
…into 5.5.0_dev

� Conflicts:
�	views/admin/de/tcklarna_lang.php
�	views/admin/tpl/tcklarna_start.tpl
@tc-hugo
Merge branch '5.5.0_dev' of https://github.com/topconcepts/OXID-Klarna-6
81ee1c4 


� Conflicts:
�	views/admin/en/tcklarna_lang.php
@tc-hugo
Backend rebranding
e331c33
@tc-hugo
Merge branch 'backend-rebranding' into 'master'
ea66e1a 
Backend rebranding

See merge request cgrd/customer-projects/klarna/OXID-Klarna-6!49
@tc-hugo
v5.5.0 fix codeception tests
ac3a428
@tc-hugo
Merge branch 'master' of https://github.com/topconcepts/OXID-Klarna-6
1882a05 
� Conflicts:
�	Tests/Codeception/Page/Kco.php
�	Tests/Codeception/acceptance/CheckoutKCOCest.php
@tc-hugo
v5.6.0 Fix unit tests for OXID 6.3
1cd64bd
@tc-hugo
v5.6.0 Fix Spelling on new Klarna admin start page
f86e6c0
@tc-hugo
Fix bug related with delivery cost adding up
d2ba5d9 
add unit test
@tc-hugo
add codeception test to check shipping method price
cacd582
@tc-hugo
keep calcDeliverycost parent call for compatibility with other modules.
57112e3
@tc-hugo
Fix Spelling on new Klarna admin start page english
6d89c14
@tc-hugo
version 5.5.1
e11c721
@tc-hugo tc-hugo merged commit 0d32160 into master Jul 1, 2021
@FATCHIP-GmbH FATCHIP-GmbH deleted the 5.5.1_dev branch July 18, 2022 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tc-hugo @ksojsann