Skip to content
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.

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

[5.3] Products & Variants card view designer #3809

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG-WIP.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Release Notes for Craft Commerce (WIP)

### Store Management
- It is now possible to design card views for Products and Variants. ([#3809](https://github.com/craftcms/commerce/pull/3809))
- Order conditions can now have a “Coupon Code” rule. ([#3776](https://github.com/craftcms/commerce/discussions/3776))
- Order conditions can now have a “Payment Gateway” rule. ([#3722](https://github.com/craftcms/commerce/discussions/3722))
- Variant conditions can now have a “Product” rule.
Expand All @@ -21,3 +22,6 @@
- Added `craft\commerce\elements\db\OrderQuery::couponCode()`.
- Added `craft\commerce\services\Inventory::updateInventoryLevel()`.
- Added `craft\commerce\services\Inventory::updatePurchasableInventoryLevel()`.

### System
- Craft Commerce now requires Craft CMS 5.5 or later.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"prefer-stable": true,
"require": {
"php": "^8.2",
"craftcms/cms": "^5.2.0",
"craftcms/cms": "^5.5.0",
"dompdf/dompdf": "^2.0.2",
"ibericode/vat": "^1.2.2",
"iio/libmergepdf": "^4.0",
Expand Down
371 changes: 187 additions & 184 deletions composer.lock

Large diffs are not rendered by default.

95 changes: 95 additions & 0 deletions src/base/Purchasable.php
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,24 @@ protected function attributeHtml(string $attribute): string
}
}

$dimensions = [];
if ($attribute === 'dimensions') {
$dimensions = array_filter([
$this->length,
$this->width,
$this->height,
]);
}

if ($attribute === 'priceView') {
$price = $this->basePriceAsCurrency;
if ($this->getBasePromotionalPrice() && $this->getBasePromotionalPrice() < $this->getBasePrice()) {
$price = Html::tag('del', $price, ['style' => 'opacity: .5']) . ' ' . $this->basePromotionalPriceAsCurrency;
}

return $price;
}

return match ($attribute) {
'sku' => (string)Html::encode($this->getSkuAsText()),
'price' => $this->basePriceAsCurrency,
Expand All @@ -1300,6 +1318,7 @@ protected function attributeHtml(string $attribute): string
'minQty' => (string)$this->minQty,
'maxQty' => (string)$this->maxQty,
'stock' => $stock,
'dimensions' => !empty($dimensions) ? implode(' x ', $dimensions) . ' ' . Plugin::getInstance()->getSettings()->dimensionUnits : '',
default => parent::attributeHtml($attribute),
};
}
Expand Down Expand Up @@ -1337,6 +1356,82 @@ protected static function defineDefaultTableAttributes(string $source): array
];
}

/**
* @inheritdoc
*/
public static function attributePreviewHtml(array $attribute): mixed
{
return match ($attribute['value']) {
'sku', 'priceView', 'dimensions', 'weight' => $attribute['placeholder'],
'availableForPurchase', 'promotable' => Html::tag('span', '', [
'class' => 'checkbox-icon',
'role' => 'img',
'title' => $attribute['label'],
'aria' => [
'label' => $attribute['label'],
],
]) .
Html::tag('span', $attribute['label'], [
'class' => 'checkbox-preview-label',
]),
default => parent::attributePreviewHtml($attribute)
};
}

/**
* @inheritdoc
*/
protected static function defineDefaultCardAttributes(): array
{
return array_merge(parent::defineDefaultCardAttributes(), [
'sku',
'priceView',
]);
}

/**
* @inheritdoc
*/
protected static function defineCardAttributes(): array
{
return array_merge(Element::defineCardAttributes(), [
'availableForPurchase' => [
'label' => Craft::t('commerce', 'Available for purchase'),
],
'basePrice' => [
'label' => Craft::t('commerce', 'Base Price'),
'placeholder' => '¤' . Craft::$app->getFormattingLocale()->getFormatter()->asDecimal(123.99),
],
'basePromotionalPrice' => [
'label' => Craft::t('commerce', 'Base Promotional Price'),
'placeholder' => '¤' . Craft::$app->getFormattingLocale()->getFormatter()->asDecimal(123.99),
],
'dimensions' => [
'label' => Craft::t('commerce', 'Dimensions'),
'placeholder' => '1 x 2 x 3 ' . Plugin::getInstance()->getSettings()->dimensionUnits,
],
'priceView' => [
'label' => Craft::t('commerce', 'Price'),
'placeholder' => Html::tag('del', '¤' . Craft::$app->getFormattingLocale()->getFormatter()->asDecimal(199.99), ['style' => 'opacity: .5']) . ' ¤' . Craft::$app->getFormattingLocale()->getFormatter()->asDecimal(123.99),
],
'promotable' => [
'label' => Craft::t('commerce', 'Promotable'),
],
'sku' => [
'label' => Craft::t('commerce', 'SKU'),
'placeholder' => Html::tag('code', 'SKU123'),
],
'stock' => [
'label' => Craft::t('commerce', 'Stock'),
'placeholder' => 10,
],
'weight' => [
'label' => Craft::t('commerce', 'Weight'),
'placeholder' => 123 . Plugin::getInstance()->getSettings()->weightUnits,
],
]);
}

/**
* @inheritdoc
*/
Expand Down
39 changes: 39 additions & 0 deletions src/elements/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,45 @@ protected static function defineDefaultTableAttributes(string $source): array
return $attributes;
}

/**
* @inheritdoc
*/
public static function attributePreviewHtml(array $attribute): mixed
{
return match ($attribute['value']) {
'defaultSku' => $attribute['placeholder'],
default => parent::attributePreviewHtml($attribute)
};
}

/**
* @inheritdoc
*/
protected static function defineCardAttributes(): array
{
return array_merge(parent::defineCardAttributes(), [
'defaultPrice' => [
'label' => Craft::t('commerce', 'Price'),
'placeholder' => '¤' . Craft::$app->getFormattingLocale()->getFormatter()->asDecimal(123.99),
],
'defaultSku' => [
'label' => Craft::t('commerce', 'SKU'),
'placeholder' => Html::tag('code', 'SKU123'),
],
]);
}

/**
* @inheritdoc
*/
protected static function defineDefaultCardAttributes(): array
{
return array_merge(parent::defineDefaultCardAttributes(), [
'defaultSku',
'defaultPrice',
]);
}

/**
* @inheritdoc
*/
Expand Down
12 changes: 12 additions & 0 deletions src/elements/Variant.php
Original file line number Diff line number Diff line change
Expand Up @@ -1372,6 +1372,18 @@ protected static function defineSearchableAttributes(): array
return [...parent::defineSearchableAttributes(), ...['productTitle']];
}

/**
* @inheritdoc
*/
protected static function defineCardAttributes(): array
{
return array_merge(parent::defineCardAttributes(), [
'product' => [
'label' => Craft::t('commerce', 'Product'),
],
]);
}

/**
* @inheritdoc
*/
Expand Down
1 change: 1 addition & 0 deletions src/services/LineItems.php
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ public function create(Order $order, array $params = [], LineItemType $type = Li
}

$params['class'] = LineItem::class;
/** @var LineItem $lineItem */
$lineItem = Craft::createObject($params);

if ($lineItem->type === LineItemType::Purchasable) {
Expand Down
2 changes: 2 additions & 0 deletions src/templates/settings/producttypes/_edit.twig
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@

{{ forms.fieldLayoutDesignerField({
fieldLayout: productType.getProductFieldLayout(),
withCardViewDesigner: true,
}) }}

</div>
Expand All @@ -417,6 +418,7 @@
{% namespace "variant-layout" %}
{{ forms.fieldLayoutDesignerField({
fieldLayout: productType.getVariantFieldLayout(),
withCardViewDesigner: true,
}) }}
{% endnamespace %}

Expand Down