Integrate product quantities form and related command #22986

zuk3975 · 2021-01-25T16:15:46Z

Questions	Answers
Branch?	develop
Description?	Part of product page migration. Creates form for product quantities and related Command builder. No styling or javascript, if any needed it will be added in another PR.
Type?	refacto
Category?	BO
BC breaks?	no
Deprecations?	no
Fixed ticket?	part of #14771
How to test?	CI ✔️
Possible impacts?

This change is

src/Core/Form/ChoiceProvider/OutOfStockTypeChoiceProvider.php

src/Core/Form/ChoiceProvider/PackStockTypeChoiceProvider.php

Progi1984 · 2021-01-26T08:21:06Z

src/Core/Form/IdentifiableObject/DataProvider/ProductFormDataProvider.php

+     *
+     * @return array<string, mixed>
+     */
+    private function extractQuantityData(ProductForEditing $productForEditing): array


Please add unit test

@jolelievre mentioned He will introduce tests for this class in one of his PR's

Yes you asked the same thing in my PR about SEO This is a valid request so I'll implement them in my PR to keep this one no too big (it already add tests on Providers which was never done until now)

Progi1984

Please add missing unit tests

admin-dev/themes/new-theme/js/pages/product/edit/product-partial-updater.js

admin-dev/themes/new-theme/scss/pages/orders/_orders_view.scss

jolelievre

I think we should use stock as a prefix rather than Quantity It matches the command better and it is a bit wider name than quantity Since stock is more than just a quantity
However I'm surprised I don't see the QuantityType form type integrated in the ProductType form, nor do I see any modif in the twig templates

jolelievre · 2021-01-26T12:31:42Z

src/Core/Form/ChoiceProvider/PackStockTypeChoiceProvider.php

+        $defaultLabel = sprintf(
+            '%s (%s)',
+            $this->translator->trans('Default', [], 'Admin.Global'),
+            array_search($this->defaultPackStockType, $choices, true)


Nice and efficient 👍

jolelievre · 2021-01-26T12:32:38Z

src/Core/Form/IdentifiableObject/CommandBuilder/Product/QuantityCommandBuilder.php

+/**
+ * Builds commands from product quantity form type
+ */
+final class QuantityCommandBuilder implements ProductCommandBuilderInterface


Suggested change

final class QuantityCommandBuilder implements ProductCommandBuilderInterface

final class StockCommandBuilder implements ProductCommandBuilderInterface

jolelievre · 2021-01-26T12:32:48Z

src/Core/Form/IdentifiableObject/CommandBuilder/Product/QuantityCommandBuilder.php

+     */
+    public function buildCommand(ProductId $productId, array $formData): array
+    {
+        if (!isset($formData['quantities'])) {


Suggested change

if (!isset($formData['quantities'])) {

if (!isset($formData['stock'])) {

jolelievre · 2021-01-26T12:33:17Z

src/Core/Form/IdentifiableObject/DataProvider/ProductFormDataProvider.php

@@ -63,6 +64,7 @@ public function getData($id)
        return [
            'id' => $id,
            'basic' => $this->extractBasicData($productForEditing),
+            'quantities' => $this->extractQuantityData($productForEditing),


Suggested change

'quantities' => $this->extractQuantityData($productForEditing),

'stock' => $this->extractStockData($productForEditing),

jolelievre · 2021-01-26T12:34:10Z

src/Core/Form/IdentifiableObject/DataProvider/ProductFormDataProvider.php

+     *
+     * @return array<string, mixed>
+     */
+    private function extractQuantityData(ProductForEditing $productForEditing): array


Yes you asked the same thing in my PR about SEO This is a valid request so I'll implement them in my PR to keep this one no too big (it already add tests on Providers which was never done until now)

jolelievre · 2021-01-26T12:34:29Z

src/PrestaShopBundle/Form/Admin/Sell/Product/QuantityType.php

+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Constraints\Type;
+
+class QuantityType extends TranslatorAwareType


Suggested change

class QuantityType extends TranslatorAwareType

class StockType extends TranslatorAwareType

jolelievre · 2021-01-26T12:35:18Z

src/PrestaShopBundle/Form/Admin/Sell/Product/QuantityType.php

+    {
+        $builder
+            ->add('quantity', NumberType::class, [
+                'label' => $this->trans('Quantity', 'Admin.Catalog.Feature'),


I'm not sure but I think every inputs need 'required' => false, to integrate smoothly with partial update

Not blocking though since it needs to be confirmed in the dedicated PR, besides I believe the required option can be inherited by compound forms So maybe we would only need to set it in ProductType

jolelievre · 2021-01-26T12:37:34Z

src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml

+    form.type.sell.product.quantity_type:
+        class: 'PrestaShopBundle\Form\Admin\Sell\Product\QuantityType'


Suggested change

form.type.sell.product.quantity_type:

class: 'PrestaShopBundle\Form\Admin\Sell\Product\QuantityType'

form.type.sell.product.stock_type:

class: 'PrestaShopBundle\Form\Admin\Sell\Product\StockType'

jolelievre · 2021-01-26T12:38:03Z

src/PrestaShopBundle/Resources/config/services/core/form/command_builder.yml

+    prestashop.core.form.command_builder.product.quantity_command_builder:
+        class: PrestaShop\PrestaShop\Core\Form\IdentifiableObject\CommandBuilder\Product\QuantityCommandBuilder


Suggested change

prestashop.core.form.command_builder.product.quantity_command_builder:

class: PrestaShop\PrestaShop\Core\Form\IdentifiableObject\CommandBuilder\Product\QuantityCommandBuilder

prestashop.core.form.command_builder.product.stock_command_builder:

class: PrestaShop\PrestaShop\Core\Form\IdentifiableObject\CommandBuilder\Product\StockCommandBuilder

jolelievre

Perfect! 👍

zuk3975 requested a review from a team as a code owner January 25, 2021 16:15

prestonBot added develop Branch Refactoring Type: Refactoring Waiting for wording Status: action required, waiting for wording labels Jan 25, 2021

zuk3975 changed the title ~~[WIP] Create product quantities form type and command builder~~ [WIP] Integrate product quantities form and related command Jan 25, 2021

zuk3975 changed the title ~~[WIP] Integrate product quantities form and related command~~ Integrate product quantities form and related command Jan 25, 2021

Progi1984 reviewed Jan 26, 2021

View reviewed changes

src/Core/Form/ChoiceProvider/OutOfStockTypeChoiceProvider.php Show resolved Hide resolved

Progi1984 reviewed Jan 26, 2021

View reviewed changes

src/Core/Form/ChoiceProvider/PackStockTypeChoiceProvider.php Show resolved Hide resolved

Progi1984 reviewed Jan 26, 2021

View reviewed changes

Progi1984 requested changes Jan 26, 2021

View reviewed changes

matks added the migration symfony migration project label Jan 26, 2021

matks reviewed Jan 26, 2021

View reviewed changes

admin-dev/themes/new-theme/js/pages/product/edit/product-partial-updater.js Show resolved Hide resolved

admin-dev/themes/new-theme/scss/pages/orders/_orders_view.scss Outdated Show resolved Hide resolved

Progi1984 previously approved these changes Jan 26, 2021

View reviewed changes

zuk3975 dismissed Progi1984’s stale review via 45ad9a6 January 26, 2021 10:17

zuk3975 force-pushed the m/prod-form/qty branch from 45ad9a6 to 71e461f Compare January 26, 2021 10:18

Julievrz added Wording ✔️ Status: check done, wording approved and removed Waiting for wording Status: action required, waiting for wording labels Jan 26, 2021

zuk3975 force-pushed the m/prod-form/qty branch from 15ed002 to 605ea0c Compare January 26, 2021 11:03

prestonBot added Waiting for wording Status: action required, waiting for wording and removed Wording ✔️ Status: check done, wording approved labels Jan 26, 2021

zuk3975 added 10 commits January 26, 2021 13:05

Introduce Quantity type with choice providers

2ecf312

create command builder for quantity tab

52f8cf9

add form constraints

8e640a1

Form data provider. Quantity part

1858fef

enable "save" button on datepicker changeevent (dp.change)

8d67885

add test for command builder

3c4186b

fix available_date null pointer

63a319c

OutOfStockTypeChoiceProvider test

b206551

PackStockTypeChoiceProviderTest

7ecc229

add abstract ChoiceProviderTestCase

8082f57

zuk3975 force-pushed the m/prod-form/qty branch from 605ea0c to 8082f57 Compare January 26, 2021 11:05

jolelievre requested changes Jan 26, 2021

View reviewed changes

zuk3975 added 2 commits January 26, 2021 15:02

add formType in template and tabs

2d3ebd8

rename Quantity -> Stock occurrences

3eba3b9

zuk3975 force-pushed the m/prod-form/qty branch from 125a861 to 3eba3b9 Compare January 26, 2021 13:11

jolelievre approved these changes Jan 26, 2021

View reviewed changes

Progi1984 approved these changes Jan 26, 2021

View reviewed changes

Progi1984 merged commit 16428e3 into PrestaShop:develop Jan 26, 2021

Progi1984 added this to the 1.7.8.0 milestone Jan 26, 2021

Progi1984 removed the Waiting for wording Status: action required, waiting for wording label Feb 1, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrate product quantities form and related command #22986

Integrate product quantities form and related command #22986

zuk3975 commented Jan 25, 2021 •

edited by PierreRambaud

Progi1984 Jan 26, 2021

zuk3975 Jan 26, 2021

jolelievre Jan 26, 2021

Progi1984 left a comment

jolelievre left a comment

jolelievre Jan 26, 2021

jolelievre Jan 26, 2021

jolelievre Jan 26, 2021

jolelievre Jan 26, 2021

jolelievre Jan 26, 2021

jolelievre Jan 26, 2021

jolelievre Jan 26, 2021

jolelievre Jan 26, 2021

jolelievre Jan 26, 2021

jolelievre Jan 26, 2021

jolelievre left a comment

	final class QuantityCommandBuilder implements ProductCommandBuilderInterface
	final class StockCommandBuilder implements ProductCommandBuilderInterface

	if (!isset($formData['quantities'])) {
	if (!isset($formData['stock'])) {

	'quantities' => $this->extractQuantityData($productForEditing),
	'stock' => $this->extractStockData($productForEditing),

	class QuantityType extends TranslatorAwareType
	class StockType extends TranslatorAwareType

		form.type.sell.product.quantity_type:
		class: 'PrestaShopBundle\Form\Admin\Sell\Product\QuantityType'

		prestashop.core.form.command_builder.product.quantity_command_builder:
		class: PrestaShop\PrestaShop\Core\Form\IdentifiableObject\CommandBuilder\Product\QuantityCommandBuilder

Integrate product quantities form and related command #22986

Integrate product quantities form and related command #22986

Conversation

zuk3975 commented Jan 25, 2021 • edited by PierreRambaud

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Progi1984 left a comment

Choose a reason for hiding this comment

jolelievre left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jolelievre left a comment

Choose a reason for hiding this comment

zuk3975 commented Jan 25, 2021 •

edited by PierreRambaud