Skip to content
This repository has been archived by the owner on Apr 9, 2021. It is now read-only.

Discount for customer #31

Merged
merged 2 commits into from
Jan 14, 2019
Merged

Discount for customer #31

merged 2 commits into from
Jan 14, 2019

Conversation

boris-brtan
Copy link
Contributor

@boris-brtan boris-brtan commented Jan 9, 2019 •
edited
Loading

  • administration of customer now contains discount field with range validation that is reflected into User entity
  • prices of products are recalculated for logged customers based on custom discount
  • discount works also for companies with multiple users
  • CurrentCustomer is also extended for discount needs
Q A
Description, reason for the PR we want to test the extensibility of pricing from Shopsys Framework
New feature Yes
BC breaks No
Fixes issues -
Standards and tests pass Yes
Have you read and signed our License Agreement for contributions? Yes

@boris-brtan boris-brtan force-pushed the bb-cusomer-discount branch 2 times, most recently from 84c1af0 to 020a3fd Compare January 9, 2019 07:31
@DavidOstrozlik DavidOstrozlik changed the title discount for customer Discount for customer Jan 9, 2019
DavidOstrozlik
DavidOstrozlik suggested changes Jan 9, 2019
View reviewed changes
Copy link
Contributor

@DavidOstrozlik DavidOstrozlik left a comment •
edited by boris-brtan
Loading

Choose a reason for hiding this comment

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

I reviewed this PR and found just 2 cosmetic changes.
Tests: I found that:

  • you can't save User if you didn't fill the discount - fixed
  • on Firefox you can fill discount with letters and it doesn't show the correct invalid message - problem for mozilla i will create issue Fix mozilla JSvalidation for integer Constraints\Range  shopsys#717
  • on Firefox the JS validation of discount doesn't work - problem for mozilla i will create issue

CHANGELOG.md Outdated Show resolved Hide resolved
src/Shopsys/ShopBundle/Resources/translations/validators.cs.po Outdated Show resolved Hide resolved
@boris-brtan boris-brtan mentioned this pull request Jan 9, 2019
Closed
@boris-brtan
Copy link
Contributor Author

Hi, i did the fixes and created issue for the JSFormValidator for mozilla browsers

@boris-brtan
Copy link
Contributor Author

I see the same thing as in promocode so i put 0 as default value and put there not blank constraints

@boris-brtan
Copy link
Contributor Author

now there is need to test also filtering by price

DavidOstrozlik
DavidOstrozlik suggested changes Jan 10, 2019
View reviewed changes
src/Shopsys/ShopBundle/Model/Customer/User.php Outdated Show resolved Hide resolved
src/Shopsys/ShopBundle/Model/Customer/User.php Outdated Show resolved Hide resolved
src/Shopsys/ShopBundle/Model/Customer/User.php Outdated Show resolved Hide resolved
src/Shopsys/ShopBundle/Model/Customer/UserData.php Outdated Show resolved Hide resolved
src/Shopsys/ShopBundle/Model/Customer/CurrentCustomer.php Outdated Show resolved Hide resolved
src/Shopsys/ShopBundle/Model/Product/Pricing/ProductPriceCalculationForUser.php Outdated Show resolved Hide resolved
src/Shopsys/ShopBundle/Model/Product/Pricing/ProductPriceCalculation.php Show resolved Hide resolved
src/Shopsys/ShopBundle/Model/Product/Pricing/ProductPriceCalculationForUser.php Show resolved Hide resolved
src/Shopsys/ShopBundle/Controller/Front/ProductController.php Outdated Show resolved Hide resolved
src/Shopsys/ShopBundle/Controller/Front/ProductController.php Outdated Show resolved Hide resolved
@boris-brtan boris-brtan force-pushed the bb-cusomer-discount branch 2 times, most recently from 7447f83 to 7d0e555 Compare January 10, 2019 18:13
@boris-brtan boris-brtan mentioned this pull request Jan 11, 2019
Closed
DavidOstrozlik
DavidOstrozlik suggested changes Jan 11, 2019
View reviewed changes
Copy link
Contributor

@DavidOstrozlik DavidOstrozlik left a comment

Choose a reason for hiding this comment

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

I have just one suggestion and it would be great if you added information to "admin - order detail - add product" that the added product will not have any individual discounts

src/Shopsys/ShopBundle/Controller/Front/ProductController.php Outdated Show resolved Hide resolved
Boris Brtáň added 2 commits January 14, 2019 13:17
discount percentage for specific customer is implemented
305f571 
- administration of customer now contains discount field with range validation that is reflected into User entity
- prices of products are recalculated for logged customers based on custom discount
- discount works also for companies with multiple users
- CurrentCustomer is also extended to discount needs
orderItems.html.twig template is extended to warn administrator about…
0e51108 
… not applying customer specific discounts for products in order
@boris-brtan boris-brtan merged commit c81fb0a into master Jan 14, 2019
@boris-brtan boris-brtan deleted the bb-cusomer-discount branch January 14, 2019 12:19
@PetrHeinz PetrHeinz mentioned this pull request Aug 30, 2019
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@DavidOstrozlik DavidOstrozlik DavidOstrozlik approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@boris-brtan @DavidOstrozlik