diff --git a/commerce_pricelist.info.yml b/commerce_pricelist.info.yml
index 14cbed0..10e60df 100644
--- a/commerce_pricelist.info.yml
+++ b/commerce_pricelist.info.yml
@@ -5,6 +5,6 @@ core: 8.x
package: Commerce (contrib)
dependencies:
- commerce
- - commerce_pricing
+ - commerce_price
- commerce_product
- - commerce_order
\ No newline at end of file
+ - commerce_order
diff --git a/commerce_pricelist.links.action.yml b/commerce_pricelist.links.action.yml
index cc345b1..f687d58 100644
--- a/commerce_pricelist.links.action.yml
+++ b/commerce_pricelist.links.action.yml
@@ -3,6 +3,7 @@ entity.price_list.add_form:
title: 'Add Price list'
appears_on:
- entity.price_list.collection
+
entity.price_list_type.add_form:
route_name: 'entity.price_list_type.add_form'
title: 'Add Price list type'
@@ -10,7 +11,7 @@ entity.price_list_type.add_form:
- entity.price_list_type.collection
entity.price_list_item.add_form:
- route_name: entity.price_list_item.add_form
+ route_name: 'entity.price_list_item.add_form'
title: 'Add Price list item'
appears_on:
- entity.price_list_item.collection
diff --git a/commerce_pricelist.links.menu.yml b/commerce_pricelist.links.menu.yml
index fed295e..cf509db 100644
--- a/commerce_pricelist.links.menu.yml
+++ b/commerce_pricelist.links.menu.yml
@@ -1,26 +1,32 @@
# Price list menu items definition
entity.price_list.collection:
title: 'Price lists'
- route_name: entity.price_list.collection
+ route_name: 'entity.price_list.collection'
description: 'Manage your price lists'
- parent: commerce.admin_commerce
+ parent: 'commerce.admin_commerce'
+
+commerce_pricelist.configuration:
+ title: 'Price List'
+ route_name: 'commerce_pricelist.configuration'
+ description: 'Price List'
+ parent: 'commerce.configuration'
# Price list type menu items definition
entity.price_list_type.collection:
title: 'Price list types'
- route_name: entity.price_list_type.collection
+ route_name: 'entity.price_list_type.collection'
description: 'Price list types'
- parent: commerce.configuration
+ parent: 'commerce_pricelist.configuration'
# Price list item menu items definition
entity.price_list_item.collection:
title: 'Price list item list'
- route_name: entity.price_list_item.collection
+ route_name: 'entity.price_list_item.collection'
description: 'List Price list item entities'
- parent: commerce.admin_commerce
+ parent: 'commerce.admin_commerce'
price_list_item.admin.structure.settings:
- title: Price list item settings
+ title: 'Price list item settings'
description: 'Configure Price list item entities'
- route_name: price_list_item.settings
- parent: commerce.configuration
+ route_name: 'price_list_item.settings'
+ parent: 'commerce.configuration'
diff --git a/commerce_pricelist.links.task.yml b/commerce_pricelist.links.task.yml
index d8d2750..f6b869b 100644
--- a/commerce_pricelist.links.task.yml
+++ b/commerce_pricelist.links.task.yml
@@ -1,38 +1,49 @@
# Price list routing definition
entity.price_list.canonical:
- route_name: entity.price_list.canonical
- base_route: entity.price_list.canonical
+ route_name: 'entity.price_list.canonical'
+ base_route: 'entity.price_list.canonical'
title: 'View'
entity.price_list.edit_form:
- route_name: entity.price_list.edit_form
- base_route: entity.price_list.canonical
- title: Edit
+ route_name: 'entity.price_list.edit_form'
+ base_route: 'entity.price_list.canonical'
+ title: 'Edit'
entity.price_list.delete_form:
- route_name: entity.price_list.delete_form
- base_route: entity.price_list.canonical
- title: Delete
+ route_name: 'entity.price_list.delete_form'
+ base_route: 'entity.price_list.canonical'
+ title: 'Delete'
weight: 10
# Price list item routing definition
price_list_item.settings_tab:
- route_name: price_list_item.settings
+ route_name: 'price_list_item.settings'
+ base_route: 'price_list_item.settings'
title: 'Settings'
- base_route: price_list_item.settings
+
entity.price_list_item.canonical:
- route_name: entity.price_list_item.canonical
- base_route: entity.price_list_item.canonical
+ route_name: 'entity.price_list_item.canonical'
+ base_route: 'entity.price_list_item.canonical'
title: 'View'
entity.price_list_item.edit_form:
- route_name: entity.price_list_item.edit_form
- base_route: entity.price_list_item.canonical
- title: Edit
+ route_name: 'entity.price_list_item.edit_form'
+ base_route: 'entity.price_list_item.canonical'
+ title: 'Edit'
entity.price_list_item.delete_form:
- route_name: entity.price_list_item.delete_form
- base_route: entity.price_list_item.canonical
- title: Delete
+ route_name: 'entity.price_list_item.delete_form'
+ base_route: 'entity.price_list_item.canonical'
+ title: 'Delete'
weight: 10
+entity.price_list_type.collection:
+ route_name: 'entity.price_list_type.collection'
+ route_name: 'entity.price_list_type.collection'
+ title: 'List'
+
+entity.price_list_type.edit_form:
+ route_name: 'entity.price_list_type.edit_form'
+ base_route: 'entity.price_list_type.edit_form'
+ title: 'Edit'
+
diff --git a/config/install/commerce_pricelist.price_list_type.default.yml b/config/install/commerce_pricelist.price_list_type.default.yml
index 81fe2fa..94a18c9 100644
--- a/config/install/commerce_pricelist.price_list_type.default.yml
+++ b/config/install/commerce_pricelist.price_list_type.default.yml
@@ -1,4 +1,9 @@
+langcode: en
status: true
dependencies: { }
id: default
label: Default
+description: ''
+variationType: default
+injectVariationFields: true
+traits: { }
diff --git a/src/Entity/PriceList.php b/src/Entity/PriceList.php
index 1671f7d..30e3418 100644
--- a/src/Entity/PriceList.php
+++ b/src/Entity/PriceList.php
@@ -7,7 +7,6 @@ use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\Core\Entity\ContentEntityBase;
use Drupal\Core\Entity\EntityChangedTrait;
use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\commerce_pricelist\PriceListInterface;
use Drupal\user\UserInterface;
/**
diff --git a/src/Entity/PriceListItem.php b/src/Entity/PriceListItem.php
index 299f983..4f0ffb9 100644
--- a/src/Entity/PriceListItem.php
+++ b/src/Entity/PriceListItem.php
@@ -7,7 +7,6 @@ use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\Core\Entity\ContentEntityBase;
use Drupal\Core\Entity\EntityChangedTrait;
use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\commerce_pricelist\PriceListItemInterface;
use Drupal\user\UserInterface;
/**
@@ -81,6 +80,21 @@ class PriceListItem extends ContentEntityBase implements PriceListItemInterface
/**
* {@inheritdoc}
*/
+ public function getQuantity() {
+ return $this->get('quantity')->value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setQuantity($name) {
+ $this->set('quantity', $name);
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
public function getCreatedTime() {
return $this->get('created')->value;
}
@@ -101,6 +115,7 @@ class PriceListItem extends ContentEntityBase implements PriceListItemInterface
return $this->get('price')->first()->toPrice();
}
+
/**
* {@inheritdoc}
*/
@@ -184,6 +199,7 @@ class PriceListItem extends ContentEntityBase implements PriceListItemInterface
'max_length' => 50,
'text_processing' => 0,
))
+ ->setRequired(TRUE)
->setDefaultValue('')
->setDisplayOptions('view', array(
'label' => 'above',
@@ -197,6 +213,27 @@ class PriceListItem extends ContentEntityBase implements PriceListItemInterface
->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE);
+ $fields['quantity'] = BaseFieldDefinition::create('integer')
+ ->setLabel(t('Quantity'))
+ ->setDescription(t('Optional label for this price list item.'))
+ ->setSettings(array(
+ 'max_length' => 50,
+ 'text_processing' => 0,
+ ))
+ ->setRequired(TRUE)
+ ->setDefaultValue('')
+ ->setDisplayOptions('view', array(
+ 'label' => 'above',
+ 'type' => 'integer',
+ 'weight' => -4,
+ ))
+ ->setDisplayOptions('form', array(
+ 'type' => 'integer',
+ 'weight' => -4,
+ ))
+ ->setDisplayConfigurable('form', TRUE)
+ ->setDisplayConfigurable('view', TRUE);
+
$fields['price'] = BaseFieldDefinition::create('commerce_price')
->setLabel(t('Price'))
->setDescription(t('The list price'))
diff --git a/src/Entity/PriceListType.php b/src/Entity/PriceListType.php
index 52079dc..29ff5da 100644
--- a/src/Entity/PriceListType.php
+++ b/src/Entity/PriceListType.php
@@ -2,8 +2,7 @@
namespace Drupal\commerce_pricelist\Entity;
-use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
-use Drupal\commerce_pricelist\PriceListTypeInterface;
+use Drupal\commerce\Entity\CommerceBundleEntityBase;
/**
* Defines the Price list type entity.
@@ -39,19 +38,27 @@ use Drupal\commerce_pricelist\PriceListTypeInterface;
* }
* )
*/
-class PriceListType extends ConfigEntityBundleBase implements PriceListTypeInterface {
+class PriceListType extends CommerceBundleEntityBase implements PriceListTypeInterface {
/**
- * The Price list type ID.
+ * A brief description of this store type.
*
* @var string
*/
- protected $id;
+ protected $description;
/**
- * The Price list type label.
- *
- * @var string
+ * {@inheritdoc}
+ */
+ public function getDescription() {
+ return $this->description;
+ }
+
+ /**
+ * {@inheritdoc}
*/
- protected $label;
+ public function setDescription($description) {
+ $this->description = $description;
+ return $this;
+ }
}
diff --git a/src/Form/PriceListForm.php b/src/Form/PriceListForm.php
index fcdb4b8..5af4d2d 100644
--- a/src/Form/PriceListForm.php
+++ b/src/Form/PriceListForm.php
@@ -2,6 +2,8 @@
namespace Drupal\commerce_pricelist\Form;
+use Drupal\Core\Link;
+use Drupal\Core\Render\Element;
use Drupal\Core\Entity\ContentEntityForm;
use Drupal\Core\Form\FormStateInterface;
@@ -16,8 +18,123 @@ class PriceListForm extends ContentEntityForm {
*/
public function buildForm(array $form, FormStateInterface $form_state) {
/* @var $entity \Drupal\commerce_pricelist\Entity\PriceList */
- $form = parent::buildForm($form, $form_state);
- $entity = $this->entity;
+ $store_query = $this->entityManager->getStorage('commerce_store')->getQuery();
+ if ($store_query->count()->execute() == 0) {
+ $link = Link::createFromRoute('Add a new store.', 'entity.commerce_store.add_page');
+ $form['warning'] = [
+ '#markup' => t("Products can't be created until a store has been added. @link", ['@link' => $link->toString()]),
+ ];
+ return $form;
+ }
+
+ return parent::buildForm($form, $form_state);
+ }
+
+
+ /**
+ * {@inheritdoc}
+ */
+ public function form(array $form, FormStateInterface $form_state) {
+ /* @var \Drupal\commerce_pricelist\Entity\PriceList $priceList */
+ $priceList = $this->entity;
+ $form = parent::form($form, $form_state);
+
+ $form['#tree'] = TRUE;
+ $form['#theme'] = ['commerce_product_form'];
+ $form['#attached']['library'][] = 'commerce_product/form';
+
+ $form['changed'] = [
+ '#type' => 'hidden',
+ '#default_value' => $priceList->getChangedTime(),
+ ];
+
+ $form['footer'] = [
+ '#type' => 'container',
+ '#weight' => 99,
+ '#attributes' => [
+ 'class' => ['product-form-footer'],
+ ],
+ ];
+
+ $form['status']['#group'] = 'footer';
+
+ $last_saved = t('Not saved yet');
+
+ $form['meta'] = [
+ '#attributes' => ['class' => ['entity-meta__header']],
+ '#type' => 'container',
+ '#group' => 'advanced',
+ '#weight' => -100,
+ 'published' => [
+ '#type' => 'html_tag',
+ '#tag' => 'h3',
+ '#value' => $priceList->isPublished() ? $this->t('Published') : $this->t('Not published'),
+ '#access' => !$priceList->isNew(),
+ '#attributes' => [
+ 'class' => ['entity-meta__title'],
+ ],
+ ],
+ 'changed' => [
+ '#type' => 'item',
+ '#wrapper_attributes' => [
+ 'class' => ['entity-meta__last-saved', 'container-inline'],
+ ],
+ '#markup' => '' . $this->t('Last saved') . '
' . $last_saved,
+ ],
+ 'author' => [
+ '#type' => 'item',
+ '#wrapper_attributes' => [
+ 'class' => ['author', 'container-inline'],
+ ],
+ '#markup' => '' . $this->t('Author') . '
' . $priceList->getOwner()->getDisplayName(),
+ ],
+ ];
+
+ $form['advanced'] = [
+ '#type' => 'container',
+ '#attributes' => ['class' => ['entity-meta']],
+ '#weight' => 99,
+ ];
+
+ $form['price_list_store'] = [
+ '#type' => 'details',
+ '#title' => t('Price List Store'),
+ '#open' => TRUE,
+ '#group' => 'advanced',
+ '#access' => !empty($form['stores']['#access']),
+ '#attributes' => [
+ 'class' => ['product-visibility-settings'],
+ ],
+ '#weight' => 30,
+ ];
+
+ if (isset($form['stores'])) {
+ $form['stores']['#group'] = 'price_list_store';
+ $form['#after_build'][] = [get_class($this), 'hideEmptyVisibilitySettings'];
+ }
+
+ return $form;
+ }
+
+ /**
+ * Hides the visibility settings if the stores widget is a hidden element.
+ *
+ * @param array $form
+ * The form.
+ *
+ * @return array
+ * The modified visibility_settings element.
+ */
+ public static function hideEmptyVisibilitySettings(array $form) {
+ if (isset($form['stores']['widget']['target_id'])) {
+ $stores_element = $form['stores']['widget']['target_id'];
+ if (!Element::getVisibleChildren($stores_element)) {
+ $form['price_list_store']['#printed'] = TRUE;
+ // Move the stores widget out of the visibility_settings group to
+ // ensure that its hidden element is still present in the HTML.
+ unset($form['stores']['#group']);
+ }
+ }
return $form;
}
diff --git a/src/Form/PriceListTypeForm.php b/src/Form/PriceListTypeForm.php
index 8725936..9a1c656 100644
--- a/src/Form/PriceListTypeForm.php
+++ b/src/Form/PriceListTypeForm.php
@@ -2,7 +2,7 @@
namespace Drupal\commerce_pricelist\Form;
-use Drupal\Core\Entity\EntityForm;
+use Drupal\commerce\Form\CommerceBundleEntityFormBase;
use Drupal\Core\Form\FormStateInterface;
/**
@@ -10,13 +10,13 @@ use Drupal\Core\Form\FormStateInterface;
*
* @package Drupal\commerce_pricelist\Form
*/
-class PriceListTypeForm extends EntityForm {
+class PriceListTypeForm extends CommerceBundleEntityFormBase {
/**
* {@inheritdoc}
*/
public function form(array $form, FormStateInterface $form_state) {
$form = parent::form($form, $form_state);
-
+ /** @var \Drupal\commerce_pricelist\Entity\PriceListTypeInterface $price_list_type */
$price_list_type = $this->entity;
$form['label'] = array(
'#type' => 'textfield',
@@ -36,9 +36,17 @@ class PriceListTypeForm extends EntityForm {
'#disabled' => !$price_list_type->isNew(),
);
+ $form['description'] = [
+ '#type' => 'textfield',
+ '#title' => $this->t('Description'),
+ '#default_value' => $price_list_type->getDescription(),
+ ];
+
+ $form = $this->buildTraitForm($form, $form_state);
+
/* You will need additional form elements for your custom properties. */
- return $form;
+ return $this->protectBundleIdElement($form);
}
/**
diff --git a/src/PriceListAccessControlHandler.php b/src/PriceListAccessControlHandler.php
index 5164fbb..b4a8483 100644
--- a/src/PriceListAccessControlHandler.php
+++ b/src/PriceListAccessControlHandler.php
@@ -17,7 +17,7 @@ class PriceListAccessControlHandler extends EntityAccessControlHandler {
* {@inheritdoc}
*/
protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
- /** @var \Drupal\commerce_pricelist\PriceListInterface $entity */
+ /** @var \Drupal\commerce_pricelist\Entity\PriceListInterface $entity */
switch ($operation) {
case 'view':
if (!$entity->isPublished()) {
diff --git a/src/PriceListHtmlRouteProvider.php b/src/PriceListHtmlRouteProvider.php
index ec9c2ee..e3abf35 100644
--- a/src/PriceListHtmlRouteProvider.php
+++ b/src/PriceListHtmlRouteProvider.php
@@ -9,8 +9,8 @@ use Symfony\Component\Routing\Route;
/**
* Provides routes for Price list entities.
*
- * @see Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
- * @see Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
+ * @see \Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
+ * @see \Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
*/
class PriceListHtmlRouteProvider extends AdminHtmlRouteProvider {
/**
diff --git a/src/PriceListInterface.php b/src/PriceListInterface.php
deleted file mode 100644
index b6ac103..0000000
--- a/src/PriceListInterface.php
+++ /dev/null
@@ -1,83 +0,0 @@
-isPublished()) {
diff --git a/src/PriceListItemInterface.php b/src/PriceListItemInterface.php
deleted file mode 100644
index 041a42e..0000000
--- a/src/PriceListItemInterface.php
+++ /dev/null
@@ -1,75 +0,0 @@
-