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

Fix on OroPricingBundle, messages.en.yml and prices.html.twig #71

Closed
wants to merge 61 commits into from

Conversation

mapinho
Copy link

@mapinho mapinho commented Mar 2, 2018

Turn block translatable

`
--- src/Oro/Bundle/PricingBundle/Resources/translations/messages.en.yml
+++ vendor/oro/commerce/src/Oro/Bundle/PricingBundle/Resources/translations/messages.en.yml
@@ -295,6 +295,8 @@
product_prices:
empty_prices: Price not available
price_not_found: Price for requested quantity is not available

  •    qty: qty
    
  •    unit_price: 'Unit Price'
    

    notification:
    price_list:
    `

`
--- src/Oro/Bundle/PricingBundle/Resources/views/layouts/blank/imports/prices.html.twig
+++ vendor/oro/commerce/src/Oro/Bundle/PricingBundle/Resources/views/layouts/blank/imports/prices.html.twig
@@ -110,8 +110,8 @@



  •            <th class="text-uppercase">qty</th>
    
  •            <th >Unit Price</th>
    
  •            <th class="text-uppercase">{{ 'oro.pricing.frontend.qty'|trans }}</th>
    
  •            <th >{{ 'oro.pricing.frontend.unit_price'|trans }}</th>
           </tr>
           </thead>
           <tbody>
    

@@ -183,8 +183,8 @@



  •            <th style="width: 40%" class="product-prices__th text-uppercase">qty</th>
    
  •            <th style="width: 60%" class="product-prices__th">Unit Price</th>
    
  •            <th style="width: 40%" class="product-prices__th text-uppercase">{{ 'oro.pricing.frontend.qty'|trans }}</th>
    
  •            <th style="width: 60%" class="product-prices__th">{{ 'oro.pricing.frontend.unit_price'|trans }}</th>
           </tr>
           </thead>
           {{ block_widget(block) }}
    

`

Oleksandr Musiienko and others added 30 commits January 19, 2018 12:28
…/product-total-price-view (#16244)

- move requirejs module oropricing/js/app/views/product-total-price-view to blank theme
BB-13484: Products import does not work
- fixed error with undefined method hasProduct
…message

- fix create redirect option handling in SluggableEntityListener
…c repository to separate repositories

- updated composer.json, dev.json for 2.6/1.6 release
- updated dev.lock for 2.6/1.6 release
BB-13444: Release preparation activities - TEST RUN - Split Monolithic repository to separate repositories
BB-13360: SS_Product Import: Implement batch for generate_direct_url message
…L differs from root (#16303)

- changed way to include default category image on page which makes it work if there were "folder_installation" and applying filter same as for category images
…279)

* BB-13358: SS_Product Import: Avoid duplicated product SKU checks
 - update entities cache logic in helper of ImportExpertBundle
 - added insensitive case search in product repository
 - updated tests
* BB-13446:  Generate UPGRADE.md files
* BB-13446: Release preparation activities - TEST RUN - Generate UPGRADE-*.md files - MANUAL ONLY
- remove UPGRADE-1.5.md file from commerce-enterprise and move its contents to CHANGELOG.md
- add unit test for ArrayCache
- add behat test for UPS shipping cost
- add UPSTransportMock
- change ups shipping cost calculation feature
- added release date to changelogs
…Tests_Functional" failed in master (#16415)

- skipped test
…c repository to separate repositories (#16423)

- updated versions references to stable
…_shipping_integration.feature" test failed

- add FormContext to UPSBundle
- added release date to changelogs
- fix update schema wrong appearance for product attributes and extend fields import
- fix comments for product_attributes_import.feature
 - fixed feature context (we should clear CalendarDate table before adding new dates)
…ocess (#16408)

 - disable listeners on price import
 - recalculate prices after import
- change unique job name
 - added test
Mykhailo Sulyma and others added 14 commits February 2, 2018 17:32
…with numeric value [2.6] (#16493)

* BB-13606: Price rule expression fails when string attribute compared with numeric value
BB-13498: SS_Price Import: possible duplicated Website reindex messages
- Added datagrid_mode param
- Added restrictions by datagrid_mode param to isApplicable method
- Renamed constant `ParameterBag::DATAGRID_MODE_PARAMETER` to `ParameterBag::DATAGRID_MODES_PARAMETER`
- Added see annotation
- Added description to constant `Oro\Bundle\DataGridBundle\Extension\Action\ActionExtension::ENABLE_ACTIONS_PARAMETER`
BB-12882: Wrong calculation of order totals
BAP-16397: Update schema button wrong appearance
…-SELL PRODUCTS is not available to add to Shopping list (#16581)

- fix disabling
- implement behat scenario
…o bad user frontend experience

- moved delete of not managed entities to the end of indexing instead of deleting at the beginning as it leads to removing and adding products to the frontend that's not comfortable for users
BB-13423: Matrix popup cannot be displayed in the shopping list
@orocla orocla added the cla: no label Mar 2, 2018
@oroinc oroinc deleted a comment from orocla Mar 2, 2018
@mbessolov mbessolov removed the cla: no label Mar 2, 2018
@mbessolov mbessolov self-assigned this Mar 2, 2018
@mbessolov mbessolov added this to the Next LTS milestone Mar 2, 2018
@orocla
Copy link

orocla commented Mar 2, 2018

Thank you for your pull request.

It looks like this may be your first contribution to an Oro, Inc. open source project, in which case you'll need to sign a Contributor License Agreement (CLA) at http://www.orocommerce.com/contributor-license-agreement/

If you've already signed the CLA, it's possible we don't have your GitHub username or you're using a different email address. GitHub uses the email address you set in your local Git configuration to associate commits with your GitHub account. Please sign the CLA again using the correct GitHub username and email address or see this help article on setting the email on your git commits.

Once you've signed the CLA, please allow for some time for the submission to be processed.

@mbessolov
Copy link
Member

@mapinho thank you for reporting it.
The issue has been fixed, and the fix will appear in the master branch shortly, and will be included in the next release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet