Commit 15f0ed81 authored by Jonathan Sacksick's avatar Jonathan Sacksick Committed by Jonathan Sacksick
Browse files

Issue #3314990 by jsacksick, rszrama: Update the order entity label to "Order [order:number]".

parent 171a274d

modules/order/src/Entity/Order.php

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ use Drupal\profile\Entity\ProfileInterface; 
 *       "default" = "Drupal\commerce_order\Form\OrderForm",

 *       "add" = "Drupal\commerce_order\Form\OrderForm",

 *       "edit" = "Drupal\commerce_order\Form\OrderForm",

 *       "delete" = "Drupal\Core\Entity\ContentEntityDeleteForm",

 *       "delete" = "Drupal\commerce_order\Form\OrderDeleteForm",

 *       "unlock" = "Drupal\commerce_order\Form\OrderUnlockForm",

 *       "resend-receipt" = "Drupal\commerce_order\Form\OrderReceiptResendForm",

 *     },
@@ -107,7 +107,7 @@ class Order extends CommerceContentEntityBase implements OrderInterface { 
    $label = NULL;

    $order_number = $this->getOrderNumber();

    if ($order_number) {

      $label = $order_number;

      $label = $this->t('Order @order_number', ['@order_number' => $order_number]);

    }

    elseif ($this->getState()->getId() === 'draft' && !$this->isNew()) {

      $label = $this->t('Draft @id', ['@id' => $this->id()]);

modules/order/src/Form/OrderDeleteForm.php

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?php



namespace Drupal\commerce_order\Form;



use Drupal\Core\Entity\ContentEntityDeleteForm;



/**

 * Provides a form for deleting an order.

 */

class OrderDeleteForm extends ContentEntityDeleteForm {



  /**

   * {@inheritdoc}

   */

  public function getQuestion() {

    return $this->t('Are you sure you want to delete %label?', [

      '%label' => $this->getEntity()->label() ?? $this->getEntity()->id(),

    ]);

  }



}

modules/order/src/Form/OrderForm.php

+7 −1
Original line number Diff line number Diff line
@@ -168,7 +168,13 @@ class OrderForm extends ContentEntityForm { 
   */

  public function save(array $form, FormStateInterface $form_state) {

    $this->entity->save();

    $this->messenger()->addMessage($this->t('The order %label has been successfully saved.', ['%label' => $this->entity->label()]));

    $label = $this->entity->label();

    if ($label) {

      $this->messenger()->addStatus($this->t('%label saved.', ['%label' => $this->entity->label()]));

    }

    else {

      $this->messenger()->addStatus($this->t('Order saved.'));

    }

    $form_state->setRedirect('entity.commerce_order.canonical', ['commerce_order' => $this->entity->id()]);

  }

modules/order/src/Form/OrderReceiptResendForm.php

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ class OrderReceiptResendForm extends ContentEntityConfirmFormBase { 
   * {@inheritdoc}

   */

  public function getQuestion() {

    return $this->t('Are you sure you want to resend the receipt for order %label?', [

    return $this->t('Are you sure you want to resend the receipt for %label?', [

      '%label' => $this->entity->label(),

    ]);

  }

modules/order/src/Form/OrderUnlockForm.php

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ class OrderUnlockForm extends ContentEntityConfirmFormBase { 
   * {@inheritdoc}

   */

  public function getQuestion() {

    return $this->t('Are you sure you want to unlock the order %label?', [

    return $this->t('Are you sure you want to unlock %label?', [

      '%label' => $this->entity->label(),

    ]);

  }