Skip to content
Snippets Groups Projects
Commit 2714fc30 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge branch 'hotline#95858_pas_le_bon_picto_sur_reservation' into 'hotline'

hotline#95858 : fix icon error on hold cancellation button (smartphone version)

See merge request !3253
parents 653757e7 21fa8ce5
Branches
Tags 6.47
3 merge requests!3297WIP: Master,!3266Hotline,!3253hotline#95858 : fix icon error on hold cancellation button (smartphone version)
Pipeline #8352 passed with stage
in 38 minutes and 59 seconds
- ticket #95858 : Profil Smartphone : Correction de pictogramme sur le bouton suppression de réservation
\ No newline at end of file
...@@ -48,4 +48,8 @@ class ZendAfi_View_Helper_Telephone_Abonne_Holds extends ZendAfi_View_Helper_Tel ...@@ -48,4 +48,8 @@ class ZendAfi_View_Helper_Telephone_Abonne_Holds extends ZendAfi_View_Helper_Tel
} }
protected function _getOperationClass() {
return 'delete';
}
} }
\ No newline at end of file
...@@ -50,4 +50,9 @@ class ZendAfi_View_Helper_Telephone_Abonne_Loans extends ZendAfi_View_Helper_Tel ...@@ -50,4 +50,9 @@ class ZendAfi_View_Helper_Telephone_Abonne_Loans extends ZendAfi_View_Helper_Tel
$this->_('Prolonger')) $this->_('Prolonger'))
: ''; : '';
} }
protected function _getOperationClass() {
return 'forward';
}
} }
\ No newline at end of file
...@@ -31,7 +31,7 @@ class ZendAfi_View_Helper_Telephone_Abonne_Operations extends ZendAfi_View_Helpe ...@@ -31,7 +31,7 @@ class ZendAfi_View_Helper_Telephone_Abonne_Operations extends ZendAfi_View_Helpe
return $this->_tag('ul', return $this->_tag('ul',
$this->_renderTitle() . $this->_renderOperations(), $this->_renderTitle() . $this->_renderOperations(),
['data-role' => 'listview', ['data-role' => 'listview',
'data-split-icon' => 'forward']); 'data-split-icon' => $this->_getOperationClass()]);
} }
......
...@@ -155,7 +155,7 @@ class AbonneControllerTelephoneFicheTest extends AbonneControllerTelephoneTestCa ...@@ -155,7 +155,7 @@ class AbonneControllerTelephoneFicheTest extends AbonneControllerTelephoneTestCa
/** @test */ /** @test */
public function contextShouldExpectation() { public function ficheAbonneShouldContainCancelHoldLink() {
$this->assertXPath('//a[contains(@href, "cancel-hold/id/666_123")]'); $this->assertXPath('//a[contains(@href, "cancel-hold/id/666_123")]');
} }
...@@ -170,6 +170,18 @@ class AbonneControllerTelephoneFicheTest extends AbonneControllerTelephoneTestCa ...@@ -170,6 +170,18 @@ class AbonneControllerTelephoneFicheTest extends AbonneControllerTelephoneTestCa
public function pageShouldDisplayLintToIndex() { public function pageShouldDisplayLintToIndex() {
$this->assertXPath('//a[@href = "/index/index/id_profil/2"]'); $this->assertXPath('//a[@href = "/index/index/id_profil/2"]');
} }
/** @test */
public function prolongerPretIconShouldBeForward() {
$this->assertXPath('//ul[@data-split-icon="forward"]//a[contains(@href,"abonne/prolongerpret")]');
}
/** @test */
public function supprimerReservationIconShouldBeDelete() {
$this->assertXPath('//ul[@data-split-icon="delete"]//a[contains(@href,"abonne/cancel-hold")]');
}
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment