Skip to content

Essential part of https://bugs.oxid-esales.com/view.php?id=7100 as PR #983

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

Open
wants to merge 1 commit into
base: b-7.2.x
Choose a base branch
from
Open

Essential part of https://bugs.oxid-esales.com/view.php?id=7100 as PR #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions source/Application/Model/Voucher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ public function getVoucherByNr($sVoucherNr, $aVouchers = [], $blCheckavalability
$sQ .= "( {$sViewName}.oxorderid is NULL || {$sViewName}.oxorderid = '' ) ";
$sQ .= " and ( {$sViewName}.oxdateused is NULL || {$sViewName}.oxdateused = 0 ) ";

// Validate end date of voucher (To prevent issue in case same voucher number been used for multiple voucherseries)
$sQ .= " and ({$sSeriesViewName}.oxenddate >= NOW() OR {$sSeriesViewName}.oxenddate = '0000-00-00 00:00:00')";

//voucher timeout for 3 hours
if ($blCheckavalability) {
$iTime = time() - $this->getVoucherTimeout();
Expand Down
53 changes: 53 additions & 0 deletions tests/Integration/Application/Model/Vouchers/VoucherTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?php

/**
* Copyright © OXID eSales AG. All rights reserved.
* See LICENSE file for license details.
*/

declare(strict_types=1);

namespace OxidEsales\EshopCommunity\Tests\Integration\Application\Model\Vouchers;

use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;

class VoucherTest extends IntegrationTestCase
{
public function testSameReusedVoucherNumberOfEndedSerieCanBeCorrectlySelected(): void
{
$serie1 = oxNew('oxvoucherserie');
$serie1->assign([
'oxserienr' => 'Reused finished serie',
'oxenddate' => date('Y-m-d H:i:s', time() - 3600 * 3)
]);
$serie1->save();

$serie2 = oxNew('oxvoucherserie');
$serie2->assign([
'oxserienr' => 'Reused active serie',
'oxenddate' => date('Y-m-d H:i:s', time() + 3600 * 3)
]);
$serie2->save();

$reusedVoucherNumber = uniqid();

$voucher1 = oxNew("oxvoucher");
$voucher1->assign([
'OXVOUCHERNR' => $reusedVoucherNumber,
'OXVOUCHERSERIEID' => $serie1->getId()
]);
$voucher1->save();

$voucher2 = oxNew("oxvoucher");
$voucher2->assign([
'OXVOUCHERNR' => $reusedVoucherNumber,
'OXVOUCHERSERIEID' => $serie2->getId()
]);
$voucher2->save();

$voucherTry = oxNew("oxvoucher");
$voucherTry->getVoucherByNr($reusedVoucherNumber);

$this->assertSame($serie2->getId(), $voucherTry->getFieldData('OXVOUCHERSERIEID'));
}
}