[Shop][Admin] Final UI tweak before alpha release #6440

pjedrzejewski · 2016-10-17T20:51:57Z

Q	A
Bug fix?	yes
New feature?	yes
BC breaks?	yes
Related tickets	-
License	MIT

michalmarcinkowski · 2016-10-18T06:37:03Z

src/Sylius/Bundle/AdminBundle/Resources/config/routing/order.yml

+        _sylius:
+            section: admin
+            template: SyliusAdminBundle:Order:update.html.twig
+            permission: true


Is the permission option still used?

michalmarcinkowski · 2016-10-18T06:39:27Z

src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Summary/_totals.html.twig

        {% else %}
-            <p><small>{{ 'sylius.ui.no_taxes'|trans }}</small></p>
+            <p>{{ 'sylius.ui.no_taxes'|trans }}.</p>


The . is necessary here?

michalmarcinkowski · 2016-10-18T06:44:08Z

src/Sylius/Bundle/CoreBundle/Resources/config/app/sylius/sylius_product.yml

@@ -20,3 +20,6 @@ sylius_product:
                repository: Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductVariantRepository
                form:
                    default: Sylius\Bundle\CoreBundle\Form\Type\Product\ProductVariantType
+        product_option:
+            classes:
+                repository: Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductOptionRepository


Shouldn't this be specified in ProductBundle?

Should, but it won't replace the class name inside of Doctrine itself, only for the service if we configure it via xml file in the bundle. This is that old annoying bug, otherwise we cannot use custom methods in grids because they use getRepository.

pamil · 2016-10-19T13:38:44Z

src/Sylius/Behat/Context/Ui/Admin/ManagingOrdersContext.php

@@ -64,22 +64,22 @@
     * @param SharedStorageInterface $sharedStorage
     * @param IndexPageInterface $indexPage
     * @param ShowPageInterface $showPage
-     * @param UpdateShippingAddressPageInterface $updateShippingAddressPage
+     * @param UpdatePageInterface $updateShippingAddressPage


$updateShippingAddressPage -> $updatePage

pamil · 2016-10-19T13:42:12Z

src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/taxon.yml

@@ -4,6 +4,6 @@ sylius_admin_partial_taxon_tree:
    defaults:
        _controller: sylius.controller.taxon:indexAction
        _sylius:
-            template: SyliusAdminBundle:Taxon:index.html.twig
+            template: @SyliusAdmin/Taxon/Partial/_tree.html.twig


These all values with leading @ should be inside quotation marks - http://symfony.com/blog/new-in-symfony-2-8-yaml-deprecations

pamil · 2016-10-19T13:44:48Z

src/Sylius/Bundle/AdminBundle/Resources/views/Grid/Field/state.html.twig

@@ -1,7 +1,7 @@
 {% set value = 'sylius.ui.' ~ data %}

 {% if options.vars.labels is defined %}
-    {% include [(options.vars.labels ~ ':' ~ data ~ '.html.twig'), '@SyliusUi/Label/_default.html.twig'] with {'value': value} %}
+    {% include [(options.vars.labels ~ '/' ~ data ~ '.html.twig'), '@SyliusUi/Label/_default.html.twig'] with {'value': value} %}


We can use only this line instead of the whole if structure (don't know how it will affect performance though).

pamil · 2016-10-19T13:53:19Z

src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Summary/_totals.html.twig

+                        <div class="content">
+                            <span class="header">{{ label }}</span>
+                            <div class="description">
+                                {% if not amount == 0 %}-{% endif %}{{ (-1 * amount)|sylius_price(order.currencyCode, order.exchangeRate) }}


Here and everywhere else:

{% if not amount == 0 %}-{% endif %}{{ (-1 * amount)|sylius_price(order.currencyCode, order.exchangeRate) }}

can be replaced with just:

{{ amount|sylius_price(order.currencyCode, order.exchangeRate) }}

Seems like it was a workaround for some currently fixed bug.

pamil · 2016-10-19T13:54:09Z

src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_header.html.twig

+                    {{ order.completedAt|format_date }}
+                </div>
+                <div class="item">
+                    {% include [('@SyliusAdmin/Order/Label/State' ~ '/' ~ order.state ~ '.html.twig'), '@SyliusUi/Label/_default.html.twig'] with {'value': ('sylius.ui.' ~ order.state)|trans} %}


'@SyliusAdmin/Order/Label/State' ~ '/' ~ order.state -> '@SyliusAdmin/Order/Label/State/' ~ order.state

michalmarcinkowski · 2016-10-20T10:25:19Z

src/Sylius/Bundle/AddressingBundle/Resources/config/validation/Province.xml

-                <option name="min">5</option>
-                <option name="minMessage">sylius.province.code.min_length</option>
-                <option name="groups">sylius</option>
-            </constraint>


Why removing this? The province shouldn't have less than 5 characters, all should be in the same format e.g. US-FL

Cause regexp + length is stupid. Double validation error...

michalmarcinkowski · 2016-10-20T14:35:32Z

Great work Paweł! 👍

[Shop][Admin] Final UI tweak before alpha release

pjedrzejewski added Admin AdminBundle related issues and PRs. UX Issues and PRs aimed at improving User eXperience. labels Oct 17, 2016

michalmarcinkowski reviewed Oct 18, 2016

View reviewed changes

michalmarcinkowski approved these changes Oct 18, 2016

View reviewed changes

pjedrzejewski force-pushed the ui/before-alpha-tweaks branch from 1be9c43 to 23d1c16 Compare October 19, 2016 09:23

michalmarcinkowski added this to the v1.0.0-ALPHA1 milestone Oct 19, 2016

pamil reviewed Oct 19, 2016

View reviewed changes

pjedrzejewski added 11 commits October 19, 2016 17:20

[Admin] Tweak the admin users UI and naming conventions

8889a28

[Admin] UI tweaks and improvements

b13204e

[Admin] Display phone number if available in order details

13d6a9a

[Admin] Tweak the filters and some UI of the product catalog

df04fc1

[Shop] Tweak the templates

b8f4d14

[Shop] Final tweak of the looks

a55d5dc

[Admin] Reorganize admin templates and routings

5b348b4

[Shop] Rework routing and templates

ab38629

[Behat] Fix the changes in order update page

5472876

[Behat] Fixes based on the UI changes

8fe23e2

[Behat] Fix order show and thank you pages

82408eb

pjedrzejewski force-pushed the ui/before-alpha-tweaks branch from 33fb104 to 82408eb Compare October 19, 2016 15:21

pjedrzejewski changed the title ~~[WIP] Final UI tweak before alpha release~~ [Shop][Admin] Final UI tweak before alpha release Oct 19, 2016

pjedrzejewski added 3 commits October 19, 2016 17:56

[Behat] Fix dashboard scenarios

7b06a85

Fix last spec

0876140

Increase waiting time for 5.6

640378b

pjedrzejewski force-pushed the ui/before-alpha-tweaks branch from ba6ae57 to 640378b Compare October 19, 2016 22:14

michalmarcinkowski reviewed Oct 20, 2016

View reviewed changes

michalmarcinkowski approved these changes Oct 20, 2016

View reviewed changes

Disable cache for autocomplete #semanticbulwa

949fa04

michalmarcinkowski mentioned this pull request Oct 20, 2016

[Admin] Fix customer gird confirmed label. #6406

Closed

Revert SemanticUI upgrade due to bug with autocomplete

51ce9e9

pjedrzejewski force-pushed the ui/before-alpha-tweaks branch from 513e9f4 to 51ce9e9 Compare October 20, 2016 13:37

Mark the scenario as TODO because it is too fragile

bf04650

pjedrzejewski force-pushed the ui/before-alpha-tweaks branch from 2668e34 to bf04650 Compare October 20, 2016 14:08

michalmarcinkowski merged commit ac66be3 into Sylius:master Oct 20, 2016

pamil pushed a commit to pamil/Sylius that referenced this pull request May 7, 2019

Merge pull request Sylius#6440 from pjedrzejewski/ui/before-alpha-tweaks

3f521dc

[Shop][Admin] Final UI tweak before alpha release

pamil pushed a commit to pamil/Sylius that referenced this pull request May 7, 2019

Merge pull request Sylius#6440 from pjedrzejewski/ui/before-alpha-tweaks

2134d8f

[Shop][Admin] Final UI tweak before alpha release

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Shop][Admin] Final UI tweak before alpha release #6440

[Shop][Admin] Final UI tweak before alpha release #6440

pjedrzejewski commented Oct 17, 2016

michalmarcinkowski Oct 18, 2016

michalmarcinkowski Oct 18, 2016

michalmarcinkowski Oct 18, 2016

pjedrzejewski Oct 19, 2016

pamil Oct 19, 2016

pamil Oct 19, 2016

pamil Oct 19, 2016

pamil Oct 19, 2016

pamil Oct 19, 2016

michalmarcinkowski Oct 20, 2016

pjedrzejewski Oct 20, 2016 •

edited

Loading

michalmarcinkowski commented Oct 20, 2016

[Shop][Admin] Final UI tweak before alpha release #6440

[Shop][Admin] Final UI tweak before alpha release #6440

Conversation

pjedrzejewski commented Oct 17, 2016

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

pjedrzejewski Oct 20, 2016 • edited Loading

Choose a reason for hiding this comment

michalmarcinkowski commented Oct 20, 2016

pjedrzejewski Oct 20, 2016 •

edited

Loading