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

2391 pridani polozky do dokladu zavre modal #2468

Merged
merged 2 commits into from
Nov 15, 2023
+93 −54
Merged

2391 pridani polozky do dokladu zavre modal #2468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7215e5
FIX - close chit form after ajax request
Nov 15, 2023
07c05e0
TESTS - add second line to chit
Nov 15, 2023
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
2 changes: 2 additions & 0 deletions app/AccountancyModule/Components/ChitForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ protected function createComponentForm(): BaseForm
->setValidationScope([])
->onClick[] = function (SubmitButton $button): void {
$this->removeItem($button);
$this->setDisplayChitForm(true);
};
}, 1);

Expand All @@ -251,6 +252,7 @@ protected function createComponentForm(): BaseForm
->onClick[] = function () use ($items): void {
$items->createOne();
$this->reload();
$this->setDisplayChitForm(true);
};

// ID of edited chit
Expand Down
1 change: 0 additions & 1 deletion tests/_support/AcceptanceTester.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public function login(string $role) : void
$I->fillField('(//input)[9]', self::LOGIN);
$I->fillField('(//input)[10]', self::PASSWORD);
$I->click('//button');
// $I->click('Send anyway'); // bypass ssl redirect
$I->waitForText('Seznam akcí');

$roleButtonSelector = "//button[contains(@class, 'ui--current-role')]";
Expand Down
144 changes: 91 additions & 53 deletions tests/acceptance/EventCashbookCest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,116 +40,145 @@ public function createEventCashbook(): void
$this->createExpenseChit();
$this->editExpenseChit();
$this->addIncomeChit();
$this->removeBothChits();
$this->createTwoLineExpenseChit();
$this->removeChits();
$this->checkRemoveSecondLineExpenseChit();
$this->cancelEvent();
}

private function createEvent(): void
{
$I = $this->I;
$I->amGoingTo('create event');
$this->I->amGoingTo('create event');

$I->click('Založit novou akci');
$I->waitForText('Název akce');
$this->I->click('Založit novou akci');
$this->I->waitForText('Název akce');

$today = date('d.m. Y');

$I->fillField('Název akce', $this->eventName);
$I->fillField('Od', $today);
$I->click('//body'); // close datepicker
$this->I->fillField('Název akce', $this->eventName);
$this->I->fillField('Od', $today);
$this->I->click('//body'); // close datepicker

$I->fillField('Do', $today);
$this->I->fillField('Do', $today);

$I->click('.ui--createEvent');
$I->see('Základní údaje');
$this->I->click('.ui--createEvent');
$this->I->see('Základní údaje');

// Go through datagrid
$I->click('Akce');
$I->executeJs('window.scrollTo(0, document.body.scrollHeight);');
$I->waitForText($this->eventName);
$I->click($this->eventName);
$this->I->click('Akce');
$this->I->executeJs('window.scrollTo(0, document.body.scrollHeight);');
$this->I->waitForText($this->eventName);
$this->I->click($this->eventName);
}

private function goToCashbookPage(): void
{
$I = $this->I;
$I->amGoingTo('open cashbook');
$this->I->amGoingTo('open cashbook');

$cashbookButton = 'Evidence plateb';
$I->waitForText($cashbookButton);
$I->click($cashbookButton);
$this->I->waitForText($cashbookButton);
$this->I->click($cashbookButton);

$I->waitForText(self::NO_CHITS_MESSAGE);
$this->I->waitForText(self::NO_CHITS_MESSAGE);
}

private function createExpenseChit(): void
{
$I = $this->I;
$I->click('Nový doklad');
$I->amGoingTo('create expense chit');
$this->I->click('Nový doklad');
$this->I->amGoingTo('create expense chit');

$purpose = 'Nákup chleba';

$this->fillChitForm(new Date(), $purpose, Operation::EXPENSE(), 'Potraviny', 'Testovací skaut', '100 + 1');
$I->scrollTo('input[name="send"]');
$I->click('input[name="send"]');
$this->I->scrollTo('input[name="send"]');
$this->I->click('input[name="send"]');
$this->waitForBalance('-101,00');
}

private function editExpenseChit(): void
{
$I = $this->I;
$I->wantTo('Update expense chit amount');
$I->scrollTo('h4[id="chitList-payment"]');
$I->click('.ui--editChit');
$I->waitForElement('[name="pid"]:not([value=""])');

$I->fillField('items[0][price]', '121');
$I->scrollTo('input[name="send"]');
$I->click('input[name="send"]');
$this->I->wantTo('Update expense chit amount');
$this->I->scrollTo('h4[id="chitList-payment"]');
$this->I->click('.ui--editChit');
$this->I->waitForElement('[name="pid"]:not([value=""])');

$this->I->fillField('items[0][price]', '121');
$this->I->scrollTo('input[name="send"]');
$this->I->click('input[name="send"]');
$this->waitForBalance('-121,00');
}

private function addIncomeChit(): void
{
$I = $this->I;
$I->click('Nový doklad');
$I->amGoingTo('add income chit');
$this->I->click('Nový doklad');
$this->I->amGoingTo('add income chit');

$this->fillChitForm(new Date(), 'Účastnické poplatky', Operation::INCOME(), 'Přijmy od účastníků', 'Testovací skaut 2', '100');
$I->scrollTo('input[name="send"]');
$I->click('input[name="send"]');
$this->I->scrollTo('input[name="send"]');
$this->I->click('input[name="send"]');

$this->waitForBalance('-21,00');
}

private function removeBothChits(): void
private function createTwoLineExpenseChit(): void
{
$I = $this->I;
$I->amGoingTo('remove both chits');
$this->I->click('Nový doklad');
$this->I->amGoingTo('create expense chit');
$this->fillChitForm(new Date(), 'Rohlíky', Operation::EXPENSE(), 'Potraviny', 'Testovací skaut', '50');
$this->I->click('input[name="items[addItem]"]');
$this->I->wait(2);
$this->I->expect('Odebrat položku');
$this->I->seeElement('input[name="items[1][remove]"]');
$this->fillSecondChitForm('Hřebíky', Operation::EXPENSE(), 'Materiál', 'Testovací skaut', '50');
$this->I->scrollTo('input[name="send"]');
$this->I->click('input[name="send"]');
$this->waitForBalance('-121,00');
}

private function checkRemoveSecondLineExpenseChit(): void
{
$this->goToCashbookPage();

$this->I->click('Nový doklad');
$this->I->waitForText('Položky');
$this->I->click('input[name="items[addItem]"]');
$this->I->expect('Odebrat položku');
$this->I->seeElement('input[name="items[0][remove]"]');
$this->I->click('input[name="items[0][remove]"]');
$this->I->wait(3);
$this->I->dontSeeElement('//input[@type="submit" and @value="Odebrat položku"]');
$this->I->click('Nový doklad');
$this->I->wait(3);
$this->I->dontSeeElement('//input[@type="submit" and @value="Uložit"]');
}

$I->scrollTo('h4[id="chitList-payment"]');
private function removeChits(): void
{
$this->I->amGoingTo('remove chits');
$this->I->scrollTo('h4[id="chitList-payment"]');
$this->removeChit(1);
$this->waitForBalance('-121,00');
$I->scrollTo('h4[id="chitList-payment"]');
$this->waitForBalance('-221,00');
$this->I->scrollTo('h4[id="chitList-payment"]');
$this->removeChit(1);
$this->waitForBalance('-100,00');
$this->I->scrollTo('h4[id="chitList-payment"]');
$this->removeChit(1);
$I->waitForText(self::NO_CHITS_MESSAGE);
$this->I->waitForText(self::NO_CHITS_MESSAGE);
}

private function cancelEvent(): void
{
$I = $this->I;
$I->amGoingTo('cancel the event');
$this->I->amGoingTo('cancel the event');

$I->click('Akce');
$this->I->click('Akce');

$cancelButton = sprintf("//a[text()='%s']/ancestor::tr//a[contains(@class, 'btn-danger')][1]", $this->eventName);

$I->waitForElement($cancelButton);
$I->disablePopups();
$I->click($cancelButton);
$this->I->waitForElement($cancelButton);
$this->I->disablePopups();
$this->I->click($cancelButton);

$I->waitForElementNotVisible($cancelButton);
$this->I->waitForElementNotVisible($cancelButton);
}

private function fillChitForm(Date $date, string $purpose, Operation $type, string $category, string $recipient, string $amount): void
Expand All @@ -165,6 +194,15 @@ private function fillChitForm(Date $date, string $purpose, Operation $type, stri
$this->I->fillField('items[0][price]', $amount);
}

private function fillSecondChitForm(string $purpose, Operation $type, string $category, string $recipient, string $amount): void
{
$this->I->wantToTest('Uložit');
$this->I->fillField('items[1][purpose]', $purpose);
$this->I->selectOption(sprintf('items[1][%sCategories]', $type->equals(Operation::EXPENSE()) ? 'expense' : 'income'), $category);
$this->I->fillField('Komu/Od', $recipient);
$this->I->fillField('items[1][price]', $amount);
}

private function waitForBalance(string $balance): void
{
$this->I->expectTo(sprintf('see %s CZK as final balance', $balance));
Expand Down
Loading