Promo-config related improvements

vanilophp · Aug 25, 2024 · 04475dd · 04475dd
1 parent 22a49f0
commit 04475dd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/Promotion/Actions/CartFixedDiscount.php b/src/Promotion/Actions/CartFixedDiscount.php
@@ -24,7 +24,7 @@ public static function getName(): string
  public function getTitle(array $configuration): string
  {
  if (null === $amount = $configuration['amount'] ?? null) {
- return __('Invalid Configuration: The `:parameter` parameter is missing', ['parameter' => 'amount']);
+ return __('X amount discount on the entire cart [Invalid Configuration: The `:parameter` parameter is missing]', ['parameter' => 'amount']);
  }
 
  return __(':amount discount on the entire cart', ['amount' => format_price($amount)]);

diff --git a/src/Promotion/Actions/CartPercentageDiscount.php b/src/Promotion/Actions/CartPercentageDiscount.php
@@ -34,7 +34,7 @@ public static function getName(): string
  public function getTitle(array $configuration): string
  {
  if (null === $percent = $configuration['percent'] ?? null) {
- return __('X% discount on the entire cart. Invalid Configuration: the `:parameter` parameter is missing', ['parameter' => 'percent']);
+ return __('X% discount on the entire cart [Invalid Configuration: the `:parameter` parameter is missing]', ['parameter' => 'percent']);
  }
 
  return __(':percent% discount on the entire cart', ['percent' => $percent]);

diff --git a/src/Promotion/Models/PromotionAction.php b/src/Promotion/Models/PromotionAction.php
@@ -49,7 +49,7 @@ public function execute(object $subject): array
 
  public function getConfigurationSchema(): ?Schematized
  {
- return SchemaDefinition::wrap($this->getActionType());
+ return null !== $this->type ? SchemaDefinition::wrap($this->getActionType()) : null;
  }
 
  public function getTitle(): string

diff --git a/src/Promotion/Models/PromotionRule.php b/src/Promotion/Models/PromotionRule.php
@@ -49,7 +49,7 @@ public function isPassing(object $subject): bool
 
  public function getConfigurationSchema(): ?Schematized
  {
- return SchemaDefinition::wrap($this->getRuleType());
+ return null !== $this->type ? SchemaDefinition::wrap($this->getRuleType()) : null;
  }
 
  public function getTitle(): string

diff --git a/src/Promotion/Rules/CartQuantity.php b/src/Promotion/Rules/CartQuantity.php
@@ -21,7 +21,7 @@ public static function getName(): string
  public function getTitle(array $configuration): string
  {
  if (null === $count = $configuration['count'] ?? null) {
- return __('Invalid Configuration: The `:parameter` parameter is missing', ['parameter' => 'count']);
+ return __('At least X items in the cart [Invalid Configuration: The `:parameter` parameter is missing]', ['parameter' => 'count']);
  }
 
  return __('At least :count items in the cart', ['count' => (int) $count]);