D3Public/linkmobility4oxid
8
0
Fork 1
Code Pull Requests Projects Releases Activity

fix small issues, move wrong placed menu item

Browse Source
This commit is contained in:
Daniel Seifert
2022-07-13 15:38:53 +02:00
parent b7fc00aa8f
commit 1ed3ae40ef
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Application/Controller/Admin/AdminOrder.php
View File

@ -19,6 +19,7 @@ use D3\Linkmobility4OXID\Application\Model\Exceptions\noRecipientFoundException;
use D3\Linkmobility4OXID\Application\Model\Exceptions\successfullySentException; use D3\Linkmobility4OXID\Application\Model\Exceptions\successfullySentException;
use D3\Linkmobility4OXID\Application\Model\OrderRecipients; use D3\Linkmobility4OXID\Application\Model\OrderRecipients;
use D3\Linkmobility4OXID\Application\Model\Sms; use D3\Linkmobility4OXID\Application\Model\Sms;
use D3\LinkmobilityClient\Response\ResponseInterface;
use D3\LinkmobilityClient\ValueObject\Recipient; use D3\LinkmobilityClient\ValueObject\Recipient;
use Exception; use Exception;
use OxidEsales\Eshop\Application\Controller\Admin\AdminController; use OxidEsales\Eshop\Application\Controller\Admin\AdminController;
@ -90,10 +91,11 @@ class AdminOrder extends AdminController
oxNew(successfullySentException::class, $sms->getResponse()->getSmsCount()) oxNew(successfullySentException::class, $sms->getResponse()->getSmsCount())
); );
} else { } else {
$errorMsg = $sms->getResponse() instanceof ResponseInterface ? $sms->getResponse()->getErrorMessage() : 'no response';
Registry::getUtilsView()->addErrorToDisplay( Registry::getUtilsView()->addErrorToDisplay(
sprintf( sprintf(
Registry::getLang()->translateString('D3LM_EXC_MESSAGE_UNEXPECTED_ERR_SEND'), Registry::getLang()->translateString('D3LM_EXC_MESSAGE_UNEXPECTED_ERR_SEND'),
$sms->getResponse()->getErrorMessage() $errorMsg
) )
); );
} }

4
src/Application/Controller/Admin/AdminUser.php
View File

@ -18,6 +18,7 @@ namespace D3\Linkmobility4OXID\Application\Controller\Admin;
use D3\Linkmobility4OXID\Application\Model\Exceptions\noRecipientFoundException; use D3\Linkmobility4OXID\Application\Model\Exceptions\noRecipientFoundException;
use D3\Linkmobility4OXID\Application\Model\Sms; use D3\Linkmobility4OXID\Application\Model\Sms;
use D3\Linkmobility4OXID\Application\Model\UserRecipients; use D3\Linkmobility4OXID\Application\Model\UserRecipients;
use D3\LinkmobilityClient\Response\ResponseInterface;
use D3\LinkmobilityClient\ValueObject\Recipient; use D3\LinkmobilityClient\ValueObject\Recipient;
use Exception; use Exception;
use OxidEsales\Eshop\Application\Controller\Admin\AdminController; use OxidEsales\Eshop\Application\Controller\Admin\AdminController;
@ -93,10 +94,11 @@ class AdminUser extends AdminController
) )
); );
} else { } else {
$errorMsg = $sms->getResponse() instanceof ResponseInterface ? $sms->getResponse()->getErrorMessage() : 'no response';
Registry::getUtilsView()->addErrorToDisplay( Registry::getUtilsView()->addErrorToDisplay(
sprintf( sprintf(
Registry::getLang()->translateString('D3LM_EXC_MESSAGE_UNEXPECTED_ERR_SEND'), Registry::getLang()->translateString('D3LM_EXC_MESSAGE_UNEXPECTED_ERR_SEND'),
$sms->getResponse()->getErrorMessage() $errorMsg
) )
); );
} }

2
src/Application/Model/OrderRecipients.php
View File

@ -40,7 +40,7 @@ class OrderRecipients
public function getSmsRecipient(): Recipient public function getSmsRecipient(): Recipient
{ {
foreach ($this->getSmsRecipientFields() as $phoneFieldName => $countryIdFieldName) { foreach ($this->getSmsRecipientFields() as $phoneFieldName => $countryIdFieldName) {
$content = trim($this->order->getFieldData($phoneFieldName)); $content = trim((string) $this->order->getFieldData($phoneFieldName));
if (strlen($content)) { if (strlen($content)) {
$country = oxNew(Country::class); $country = oxNew(Country::class);

4
src/menu.xml
View File

@ -5,7 +5,9 @@
<SUBMENU id="mxusers" cl="admin_user" list="user_list"> <SUBMENU id="mxusers" cl="admin_user" list="user_list">
<TAB id="tbcluser_linkmobility" cl="d3linkmobility_user" /> <TAB id="tbcluser_linkmobility" cl="d3linkmobility_user" />
</SUBMENU> </SUBMENU>
<SUBMENU id="mxorders" cl="admin_orders" list="order_list"> </MAINMENU>
<MAINMENU id="mxorders">
<SUBMENU id="mxdisplayorders" cl="admin_order" list="order_list">
<TAB id="tbclorder_linkmobility" cl="d3linkmobility_order" /> <TAB id="tbclorder_linkmobility" cl="d3linkmobility_order" />
</SUBMENU> </SUBMENU>
</MAINMENU> </MAINMENU>