Merge pull request #385 from magento-api/cart-price-rules (f2efe768) · Commits · KIII-12 / Magento

Commit f2efe768 authored 9 years ago by

Korshenko, Oleksii(okorshenko)

Merge pull request #385 from magento-api/cart-price-rules

[API] Staging: Cart Price Rule

parents 3beb9316 2990ecec

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php 3 additions, 1 deletion

.../Magento/Backend/Block/System/Store/Edit/Form/Website.php
app/code/Magento/Backend/Helper/Dashboard/Order.php 19 additions, 3 deletions

app/code/Magento/Backend/Helper/Dashboard/Order.php
app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php 5 additions, 3 deletions

...Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml 1 addition, 1 deletion

...o/Catalog/view/adminhtml/ui_component/product_listing.xml
app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php 1 addition, 1 deletion

...ule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml 1 addition, 1 deletion

...CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml 1 addition, 1 deletion

...Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml
app/code/Magento/Customer/Ui/Component/Listing/Column/Websites.php 54 additions, 0 deletions

...Magento/Customer/Ui/Component/Listing/Column/Websites.php
app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml 1 addition, 1 deletion

...Customer/view/adminhtml/ui_component/customer_listing.xml
app/code/Magento/OfflineShipping/view/adminhtml/ui_component/salesrulestaging_update_form.xml 24 additions, 0 deletions

...w/adminhtml/ui_component/salesrulestaging_update_form.xml
app/code/Magento/Sales/Setup/InstallSchema.php 9 additions, 0 deletions

app/code/Magento/Sales/Setup/InstallSchema.php
app/code/Magento/Sales/etc/adminhtml/system.xml 1 addition, 1 deletion

app/code/Magento/Sales/etc/adminhtml/system.xml
app/code/Magento/Sales/etc/di.xml 1 addition, 0 deletions

app/code/Magento/Sales/etc/di.xml
app/code/Magento/Sales/i18n/en_US.csv 1 addition, 1 deletion

app/code/Magento/Sales/i18n/en_US.csv
app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_invoice_grid.xml 10 additions, 2 deletions

.../view/adminhtml/ui_component/sales_order_invoice_grid.xml
app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php 74 additions, 7 deletions

...alesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php
app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Conditions.php 74 additions, 11 deletions

...sRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Conditions.php
app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Labels.php 32 additions, 1 deletion

...SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Labels.php
app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php 6 additions, 2 deletions

...gento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php 2 additions, 1 deletion

...esRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php

with 320 additions and 38 deletions

Please register or to comment

Admin message

Merge pull request #385 from magento-api/cart-price-rules