Skip to content

Commit 6685836

Browse files
[UPMERGE] 2.2 -> 3.0 (#278)
This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/MolliePlugin/blob/1.0/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout <this-pr-number> git merge upstream/3.0 -m "Resolve conflicts between 2.2 and 3.0" ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/MolliePlugin` repository. Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
2 parents 3a63bd3 + a9975d8 commit 6685836

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

assets/shop/js/mollie/app.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -365,12 +365,7 @@ document.addEventListener('DOMContentLoaded', function () {
365365
}
366366

367367
function initializeCreditCartFields(selectedValue) {
368-
const environment = mollieData.getAttribute('data-environment');
369-
let testmode = true;
370-
371-
if (environment === 1) {
372-
testmode = false;
373-
}
368+
const testmode = '' === mollieData.getAttribute('data-environment');
374369

375370
const mollie = Mollie(mollieData.getAttribute('data-profile_id'), {
376371
locale: mollieData.getAttribute('data-locale'),

src/Repository/MollieSubscriptionRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use Sylius\Component\Core\Model\PaymentInterface;
2020
use Sylius\MolliePlugin\Entity\MollieSubscriptionInterface;
2121

22-
final class MollieSubscriptionRepository extends EntityRepository implements MollieSubscriptionRepositoryInterface
22+
class MollieSubscriptionRepository extends EntityRepository implements MollieSubscriptionRepositoryInterface
2323
{
2424
public function findOneByOrderId(int $orderId): ?MollieSubscriptionInterface
2525
{

0 commit comments

Comments
 (0)