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

Finalize shop UI, routing and templates #6843

Merged
merged 25 commits into from
Nov 30, 2016

Conversation

pjedrzejewski
Copy link
Member

Q A
Bug fix? yes
New feature? yes
BC breaks? yes
Related tickets -
License MIT
  • Also changes the payment method change flow and routing.
  • Removed "sylius_get_cart()" helper from Twig, which was just plain wrong.
  • WIP

@pjedrzejewski pjedrzejewski added BC Break PRs introducing BC breaks (do not even try to merge). Bug Fix Shop ShopBundle related issues and PRs. UX Issues and PRs aimed at improving User eXperience. labels Nov 24, 2016
@@ -75,6 +77,8 @@ gulp.task('shop-css', function() {
});

gulp.task('shop-img', function() {
gulp.src(['../../../../node_modules/lightbox2/dist/images/*']).pipe(gulp.dest(shopRootPath + 'images/'));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should move this to img: [node_modules + '/lightbox2/dist/images/*'].

@@ -31,7 +31,7 @@ Feature: Preventing shipping step completion without a selected method
Then I should not be able to complete the shipping step
And there should be information about no shipping methods available for my shipping address

@ui
@ui @todo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why these are @todo?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Darn, this was a bit hard to redo in templates unless you get a crappy structure. Anyway, the issue was that logic was in the templates and not in PHP... We will bring that back later or I may figure out something fast.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, it doesn't handle the case when no methods are available.

@pjedrzejewski pjedrzejewski changed the title [WIP] Finalize shop UI, routing and templates Finalize shop UI, routing and templates Nov 30, 2016
@michalmarcinkowski michalmarcinkowski merged commit 6ef97a5 into Sylius:master Nov 30, 2016
@michalmarcinkowski
Copy link
Contributor

Awesome job! Thanks Paweł 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BC Break PRs introducing BC breaks (do not even try to merge). Shop ShopBundle related issues and PRs. UX Issues and PRs aimed at improving User eXperience.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants