Skip to content

fix(cancel): fix cancel reasons not applied on cancel events #83

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
arnaud-hours wants to merge 3 commits into
base: 3.x
Choose a base branch
from
Open

fix(cancel): fix cancel reasons not applied on cancel events #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f9a4eb
fix(cancel): fix cancel reasons not applied on cancel events, also mo…
arnaud-hours Apr 14, 2026
da601ca
fix(cancel): fix style when saving reasons
arnaud-hours Apr 15, 2026
2d072ad
fix(cancel): fix style when saving reasons
arnaud-hours Apr 15, 2026
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
71 changes: 59 additions & 12 deletions classes/models/LengowMarketplace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public function __construct($name)
: '';
$acceptFreeValue = !isset($argDescription->accept_free_values)
|| (bool) $argDescription->accept_free_values;
$this->argValues[(string) $argKey] = [
$this->argValues[(string) $key][(string) $argKey] = [
'default_value' => $defaultValue,
'accept_free_values' => $acceptFreeValue,
'valid_values' => $validValues,
Expand Down Expand Up @@ -247,13 +247,24 @@ public function getAction($name)
*
* @return string|false
*/
public function getDefaultValue($name)
public function getDefaultValue($name, string $actionType = '')
{
if (array_key_exists($name, $this->argValues)) {
$defaultValue = $this->argValues[$name]['default_value'];
if ($actionType !== '' && isset($this->argValues[$actionType][$name])) {
$defaultValue = $this->argValues[$actionType][$name]['default_value'];
if (!empty($defaultValue)) {
return $defaultValue;
}

return false;
}
// Fallback: search across all actions (backward compatibility)
foreach ($this->argValues as $actionArgs) {
if (isset($actionArgs[$name])) {
$defaultValue = $actionArgs[$name]['default_value'];
if (!empty($defaultValue)) {
return $defaultValue;
}
}
}

return false;
Expand Down Expand Up @@ -545,8 +556,13 @@ protected function getAllParams($action, $lengowOrder, $marketplaceArguments)
$params[$arg] = date(LengowMain::DATE_ISO_8601);
break;
case LengowAction::ARG_REASON:
$params[$arg] = $lengowOrder->getRefundReasonByPrestashopId($lengowOrder->lengowId)
?? $this->getDefaultValue((string) $arg);
$savedReason = $lengowOrder->getRefundReasonByPrestashopId($lengowOrder->lengowId);
$reasonValue = $savedReason ?: $this->getDefaultValue((string) $arg, $action);
if ($reasonValue !== false && $reasonValue !== '') {
$params[$arg] = $reasonValue;
} elseif (isset($actions['optional_args']) && in_array($arg, $actions['optional_args'], true)) {
break;
}
break;
default:
if (isset($actions['optional_args']) && in_array($arg, $actions['optional_args'], true)) {
Expand Down Expand Up @@ -591,7 +607,7 @@ protected function getAllParamsForPartialRefund(
case LengowAction::ARG_REFUND_REASON:
case LengowAction::ARG_REASON:
$params[$arg] = $lengowOrder->getRefundReasonByPrestashopId($lengowOrder->lengowId)
?? $this->getDefaultValue((string) $arg);
?? $this->getDefaultValue((string) $arg, LengowAction::TYPE_REFUND);
break;
case LengowAction::ARG_REFUND_PRICE:
$params[$arg] = $decodedExtra['total_order'] ?? 0.00;
Expand All @@ -604,7 +620,7 @@ protected function getAllParamsForPartialRefund(
break;
case LengowAction::ARG_REFUND_MODE:
$params[$arg] = $lengowOrder->getRefundModeByPrestashopId($lengowOrder->lengowId)
?? $this->getDefaultValue((string) $arg);
?? $this->getDefaultValue((string) $arg, LengowAction::TYPE_REFUND);
break;
case LengowAction::ARG_REFUND_SHIPPING_PRICE:
$params[$arg] = (float) $shippingPriceTTC;
Expand Down Expand Up @@ -910,9 +926,13 @@ public function getRefundReasons(): array
$locale = new LengowTranslation();
$choices = [$locale->t('order.screen.refund_reason_label') => ''];
$arguments = $this->getMarketplaceArguments(LengowAction::TYPE_REFUND);
$reasons = in_array(LengowAction::ARG_REFUND_REASON, $arguments) ? $this->argValues[LengowAction::ARG_REFUND_REASON]['valid_values'] : [];
$reasons = in_array(LengowAction::ARG_REFUND_REASON, $arguments)
? ($this->argValues[LengowAction::TYPE_REFUND][LengowAction::ARG_REFUND_REASON]['valid_values'] ?? [])
: [];
if (empty($reasons)) {
$reasons = in_array(LengowAction::ARG_REASON, $arguments) ? $this->argValues[LengowAction::ARG_REASON]['valid_values'] : [];
$reasons = in_array(LengowAction::ARG_REASON, $arguments)
? ($this->argValues[LengowAction::TYPE_REFUND][LengowAction::ARG_REASON]['valid_values'] ?? [])
: [];
}
foreach ($reasons as $key => $reason) {
$choices[$reason] = $key;
Expand All @@ -921,6 +941,28 @@ public function getRefundReasons(): array
return $choices;
}

/**
* Get all cancel reasons choices
*/
public function getCancelReasons(): array
{
$action = $this->getAction(LengowAction::TYPE_CANCEL);
if (!$action) {
return [];
}
$locale = new LengowTranslation();
$choices = [$locale->t('order.screen.cancel_reason_label') => ''];
$arguments = $this->getMarketplaceArguments(LengowAction::TYPE_CANCEL);
$reasons = in_array(LengowAction::ARG_REASON, $arguments)
? ($this->argValues[LengowAction::TYPE_CANCEL][LengowAction::ARG_REASON]['valid_values'] ?? [])
: [];
foreach ($reasons as $key => $reason) {
$choices[$reason] = $key;
}

return $choices;
}

/**
* Will return all refund modes for cdsicount
*/
Expand All @@ -932,7 +974,9 @@ public function getRefundModes(): array
}
$locale = new LengowTranslation();
$arguments = $this->getMarketplaceArguments(LengowAction::TYPE_REFUND);
$modes = in_array(LengowAction::ARG_REFUND_MODE, $arguments) ? $this->argValues[LengowAction::ARG_REFUND_MODE]['valid_values'] : [];
$modes = in_array(LengowAction::ARG_REFUND_MODE, $arguments)
? ($this->argValues[LengowAction::TYPE_REFUND][LengowAction::ARG_REFUND_MODE]['valid_values'] ?? [])
: [];
$choices = [$locale->t('order.screen.refund_mode_label') => ''];
if (empty($modes)) {
return [];
Expand All @@ -956,7 +1000,10 @@ public function getRefundArguments(): array
}
$arguments = $this->getMarketplaceArguments(LengowAction::TYPE_REFUND);

return array_intersect($arguments, array_keys($this->argValues));
return array_intersect(
$arguments,
array_keys($this->argValues[LengowAction::TYPE_REFUND] ?? [])
);
}

/**
Expand Down
Loading
Loading