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.

Sign up for GitHub

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

Jump to bottom

Sale Unit #861

Merged
merged 63 commits into from
Mar 19, 2019
Merged

Sale Unit #861

merged 63 commits into from
Mar 19, 2019

Conversation

solverat
Copy link
Contributor

@solverat solverat commented Mar 8, 2019 •
edited by dpfaffenbauer
Loading

Q A
Bug fix? no
New feature? yes
BC breaks? no
Deprecations? no
Fixed tickets #837

Todo

  • Docu
  • Tests
  • Labels

dpfaffenbauer
dpfaffenbauer reviewed Mar 8, 2019
View reviewed changes
src/CoreShop/Bundle/CoreBundle/DependencyInjection/Configuration.php
@@ -55,6 +58,7 @@ private function addModelsSection(ArrayNodeDefinition $node)
->arrayNode('resources')
->addDefaultsIfNotSet()
->children()
# deprecated
Copy link
Member

Choose a reason for hiding this comment

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

I think we can remove that pretty safely right?

dpfaffenbauer
dpfaffenbauer reviewed Mar 8, 2019
View reviewed changes
Copy link
Member

@dpfaffenbauer dpfaffenbauer left a comment

Choose a reason for hiding this comment

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

maybe we should also move the unit stuff into a separate component/bundle to keep the product component/bundle smaller and clearer

src/CoreShop/Bundle/CoreBundle/Form/Type/Product/ProductStoreValuesType.php Show resolved Hide resolved
src/CoreShop/Bundle/CoreBundle/Migrations/Version20190308133009.php Show resolved Hide resolved
src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/builder.js Show resolved Hide resolved
src/CoreShop/Bundle/ProductBundle/Controller/ProductUnitController.php Outdated Show resolved Hide resolved
src/CoreShop/Bundle/ProductBundle/DependencyInjection/Configuration.php Show resolved Hide resolved
src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductUnitDefinitionRepository.php Outdated Show resolved Hide resolved
src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductUnitRepository.php Show resolved Hide resolved
src/CoreShop/Bundle/ProductBundle/Templating/Helper/ProductUnitDefinitionsHelperInterface.php Outdated Show resolved Hide resolved
src/CoreShop/Component/Product/Repository/ProductUnitRepositoryInterface.php Show resolved Hide resolved
src/CoreShop/Component/Product/Repository/ProductUnitDefinitionRepositoryInterface.php Outdated Show resolved Hide resolved
@dpfaffenbauer
Copy link
Member

tests are broken now as well:

General error: 1709 Index column size too large. The maximum column size is 767 bytes

CREATE TABLE coreshop_product_unit (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_803A19D05E237E06 (name), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8MB4 COLLATE utf8mb4_unicode_ci ENGINE = InnoDB

@solverat solverat force-pushed the sale_unit branch 2 times, most recently from 8fc1940 to 8f11261 Compare March 13, 2019 20:28
@dpfaffenbauer dpfaffenbauer force-pushed the sale_unit branch 3 times, most recently from 0dae964 to e4bd05e Compare March 17, 2019 12:13
solverat and others added 22 commits March 19, 2019 08:31
@solverat @dpfaffenbauer
implement sale unit basic structure
52f1d32
@solverat @dpfaffenbauer
implement product unit config panel
cc3b5f8
@solverat @dpfaffenbauer
improve additional unit addtion
ee821f5
@solverat @dpfaffenbauer
allow storeprice getter/setter, do not show unit fields, if no units …
d3d5ad6 
…has been defined
@solverat @dpfaffenbauer
improve unit combo box selection
f75ea8b
@solverat @dpfaffenbauer
refactor additional units: rename to unitdefinition
386998e
@solverat @dpfaffenbauer
split units: definition global, price store based
8a69494
@solverat @dpfaffenbauer
improve extjs ux, adding migrations
cbc3d39
@solverat @dpfaffenbauer
fix store price getter
e50bec9
@solverat @dpfaffenbauer
twig templating, cart extension
7d0963e
@dpfaffenbauer
fix migrations
03eacd9 
fix unit builder
fix product units js
@solverat @dpfaffenbauer
add additional unit to cart/order item
22937ee
@solverat @dpfaffenbauer
fix quantity unit range
9b8b168
@solverat @dpfaffenbauer
fix quantity unit range
12e7bc5
@solverat @dpfaffenbauer
fix quantity unit range
6b525d1
@solverat @dpfaffenbauer
fix quantity unit range
a2508b8
@solverat @dpfaffenbauer
split quantity ranges more granular
271a8ab
@solverat @dpfaffenbauer
split store values elements into single modules
196bc18
@solverat @dpfaffenbauer
split store values elements into single modules
2f87e2d
@solverat @dpfaffenbauer
improve unit definition and unit store price mapping
9220770
@solverat @dpfaffenbauer
frontend unit implementation: product detail
bcf9391
@solverat @dpfaffenbauer
frontend unit implementation: product detail
8bcbc91
solverat and others added 19 commits March 19, 2019 08:31
@solverat @dpfaffenbauer
fix sloppy typos
df01fcf
@dpfaffenbauer
fixes for tax calculation on product quantity rules
b87b311
@dpfaffenbauer
fix in volume calculator calculated 0 for cart-items
2fe2bfb
@solverat @dpfaffenbauer
add volume unit aware decorated calculator
98ff4b6
@solverat @dpfaffenbauer
do not display unit selector in cart item
7ca5106
@dpfaffenbauer
add translations to product units
3a2261f
@dpfaffenbauer
change cart-item-type extension to use options
d5e89dd
@dpfaffenbauer
fix unit-volume calculator when no range is found
df872a5
@dpfaffenbauer
implement stock sufficient check for new units
24f583c
@dpfaffenbauer
optimize stock sufficient stock for add-to-cart
6afba83
@dpfaffenbauer
start implementing units in backend order creation
2284a55
@dpfaffenbauer
fixes for Pimcore 5.7
028ada1
@dpfaffenbauer
[Units] start implementing tests
5bdcde2
@dpfaffenbauer
[Units] add cart tests
86e7050
@dpfaffenbauer
[Units] add cart taxation tests
c9614f8
@dpfaffenbauer
remove stan 7.2 ^5.7.0 -> not needed
488ec71
@dpfaffenbauer
[SaleUnits] add units to admin order-creation
f2d6e49
@dpfaffenbauer
[SaleUnits] fix behat tests and right kernel to use for tests
8e65e05
@dpfaffenbauer
[StoreUnit] fix doctrine issues when an entity is loaded from an vers…
55934b5 
…ion and thus not attached to the entity-manager
@dpfaffenbauer dpfaffenbauer changed the title [WIP] Sale Unit Sale Unit Mar 19, 2019
@dpfaffenbauer dpfaffenbauer merged commit ec7cc8d into coreshop:master Mar 19, 2019
@solverat solverat deleted the sale_unit branch March 20, 2019 14:55
@dpfaffenbauer dpfaffenbauer mentioned this pull request Oct 7, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dpfaffenbauer dpfaffenbauer dpfaffenbauer 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
@solverat @dpfaffenbauer