Skip to content

Commit

Permalink
Merge branch '1.13' into 1.14
Browse files Browse the repository at this point in the history
* 1.13:
  Sylius Community Edition naming in docs
  Core ItemTotalRuleChecker is missing type constant
  • Loading branch information
GSadee committed May 29, 2024
2 parents f50c785 + 5d4f0b3 commit de6b353
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 5 deletions.
Binary file added docs/_images/ce_plus_banner.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/book/configuration/channels.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ supplied with a section named Shop Billing Data, which is editable on the Channe
Business Units
~~~~~~~~~~~~~~

Sylius Plus is supplied with an enhanced version of Shop Billing Data from open source edition. It is also used for Invoicing and Refunds purposes,
Sylius Plus is supplied with an enhanced version of Shop Billing Data from Sylius CE. It is also used for Invoicing and Refunds purposes,
but it is a separate entity, that you can create outside of the Channel and then just pick a previously created Business Unit
on the Channel form.

Expand Down
2 changes: 1 addition & 1 deletion docs/book/customers/customer_pools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Customer Pools
Customer Pool is a collection of Customers that is assigned to a specific channel. Thanks to this concept, if you have two
channels, each of them has a separate customer pool, then customers that have accounts in channel A, and have not registered in channel B,
will not be able to log in to channel B with credentials they have specified in channel A (which is the behaviour happening in
Sylius open source edition). This feature allows you to sell via multiple channels, creating a illusion of shopping in
Sylius CE). This feature allows you to sell via multiple channels, creating a illusion of shopping in
completely different stores, while you still have one administration panel.

Managing Customer Pools
Expand Down
12 changes: 11 additions & 1 deletion docs/book/introduction/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,17 @@ What are our core values and what makes us different from other solutions?

And much more, but we will let you discover it yourself.

.. rst-class:: plus-doc
.. image:: ../../_images/ce_plus_banner.png
:align: center
:target: https://sylius.com/plus/?utm_source=docs&utm_medium=cta&utm_campaign=plus

|
Sylius Community Edition (CE)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

The free, open source distribution of Sylius that can be found in the `Sylius/Sylius <https://github.com/Sylius/Sylius>`_ repository
is called the Community Edition, abbreviated **Sylius CE**.

Sylius Plus
^^^^^^^^^^^
Expand Down
4 changes: 2 additions & 2 deletions docs/book/products/multi_source_inventory.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
Multi-Source Inventory
======================

Sylius Plus has a much more complex approach to inventory management than the open source version. Unlike the open source
version, that allows to specify one stock amount value for each variant, the Sylius Plus Multi-Source Inventory gives you
Sylius Plus has a much more complex approach to inventory management than the open source version. Unlike the Community Edition,
that allows to specify one stock amount value for each variant, the Sylius Plus Multi-Source Inventory gives you
a possibility to create several Inventory Sources and specify different stock amounts of variants for different Inventory Sources.

Admin can create multiple Inventory Sources (IS). For each IS they can choose Channels it will be available for.
Expand Down
6 changes: 6 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ The Developer's guide to leveraging the flexibility of Sylius. Here you will fin
Sylius Plus
-----------

.. image:: /_images/ce_plus_banner.png
:align: center
:target: https://sylius.com/plus/?utm_source=docs&utm_medium=cta&utm_campaign=plus

|
`Sylius Plus <https://sylius.com/plus/?utm_source=docs&utm_medium=cta&utm_campaign=plus>`_, which is a licensed edition of Sylius, gives you all the power of Open Source and much more.
It comes with a set of enterprise-grade features and technical support from its creators.
As the state-of-the-art eCommerce platform, it reduces risks and increases your ROI.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

final class ItemTotalRuleChecker implements RuleCheckerInterface
{
public const TYPE = 'item_total';

public function __construct(private ?RuleCheckerInterface $itemTotalRuleChecker = null)
{
if ($this->itemTotalRuleChecker instanceof self) {
Expand Down

0 comments on commit de6b353

Please sign in to comment.