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

[Forwardport] Add missing table aliases to fields mapping for Customer Group filter… #7

Merged
merged 64 commits into from
Jun 5, 2018

Conversation

hitesh-wagento
Copy link
Owner

Original Pull Request

magento#15826
… and sorting processor magento#15822

Description

This PR is a fix for magento#15822. Issue is caused by missing table alias prefixes in field mappings for customer group filter and sorting processors.

Fixed Issues

  1. SQL Error: ambiguous column 'customer_group_id' in 'All customers' page in admin when extension attribute table is joined magento/magento2#15822: SQL Error: ambiguous column 'customer_group_id' in 'All customers' page in admin when extension attribute table is joined

Manual testing scenarios

Follow the steps described in the relevant issue.

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

julienanquetil and others added 30 commits April 26, 2018 13:14
…ue to default store magento#15665

 - Merge Pull Request magento#15665 from vgelani/magento2:2.3-develop-PR-port-15332
 - Merged commits:
   1. d5c3952
…late magento#15701

 - Merge Pull Request magento#15701 from dmytro-ch/magento2:fix/2.3-html-syntax-in-report-template
 - Merged commits:
   1. 09459f6
…translation file magento#15703

 - Merge Pull Request magento#15703 from dmytro-ch/magento2:2.3-develop-PR-port-15552
 - Merged commits:
   1. 1ad9c5c
…ing same method again. magento#15706

 - Merge Pull Request magento#15706 from dmytro-ch/magento2:2.3-develop-PR-port-15517
 - Merged commits:
   1. 83b3587
   2. 82d254b
   3. 42f3f2e
 - Merge Pull Request magento#15707 from dmytro-ch/magento2:2.3-develop-PR-port-15519
 - Merged commits:
   1. 31e49bc
…agento#7897] magento#15709

 - Merge Pull Request magento#15709 from dmytro-ch/magento2:2.3-develop-PR-port-15645
 - Merged commits:
   1. 14bf8af
…agento#15717

 - Merge Pull Request magento#15717 from rogyar/magento2:2.3-wishlist-wrong-imagedata-return
 - Merged commits:
   1. b2fd343
…stances magento#15738

 - Merge Pull Request magento#15738 from vijay-wagento/magento2:2.3-develop-PR-port-15485
 - Merged commits:
   1. a9f5a1d
…idget magento#15731

 - Merge Pull Request magento#15731 from vijay-wagento/magento2:2.3-develop-PR-port-15351
 - Merged commits:
   1. eaa585d
…agento#15705

 - Merge Pull Request magento#15705 from julienanquetil/magento2:julienanquetil-fix-13415
 - Merged commits:
   1. 82d0491
   2. fbb81c9
   3. 6301ed4
…nter key fires event handle… magento#15696

 - Merge Pull Request magento#15696 from vgelani/magento2:2.3-develop-PR-port-15340
 - Merged commits:
   1. 04583ac
…edit page magento#15747

 - Merge Pull Request magento#15747 from vijay-wagento/magento2:2.3-develop-PR-port-15422
 - Merged commits:
   1. 6711694
magento#15750

 - Merge Pull Request magento#15750 from vijay-wagento/magento2:2.3-develop-PR-port-15371
 - Merged commits:
   1. 3e21edd
magento-engcom-team and others added 25 commits June 4, 2018 05:31
…gento#15752

 - Merge Pull Request magento#15752 from vijay-wagento/magento2:2.3-develop-PR-port-15301
 - Merged commits:
   1. 8128913
   2. 2922332
…magento#15763

 - Merge Pull Request magento#15763 from vgelani/magento2:2.3-develop-PR-port-15346
 - Merged commits:
   1. bcdd8f2
…agento#15764

 - Merge Pull Request magento#15764 from hitesh-wagento/magento2:feature-menu-widget-submenu-m.2.3-new
 - Merged commits:
   1. ecc5f7b
 - merged latest code from mainline branch
Accepted Public Pull Requests:
 - magento#15764: [Forwardport] [Resolved : Menu widget submenu alignment] (by @hitesh-wagento)
 - magento#15763: [Forwardport] Function unnecessarily called multiple time (by @vgelani)
 - magento#15752: [Forwardport] Refactor JavsScript for customer logout (by @vijay-wagento)
 - magento#15757: [Forwardport] Move buttons definition to separate file (by @vijay-wagento)
 - magento#15750: [Forwardport] Added language translation in template files (by @vijay-wagento)
 - magento#15747: [Forwardport] Refactor JavsScript for UrlRewrite module edit page (by @vijay-wagento)
 - magento#15696: [Forwardport] fixed Submitting search form (mini) with enter key fires event handle� (by @vgelani)
 - magento#15705: [Forwardport] Fix magento#13415 : Duplicated elements id (by @julienanquetil)
 - magento#15731: [Forwardport] Refactor javascript code of  button split widget (by @vijay-wagento)
 - magento#15738: [Forwardport] fix: support multiple minisearch widget instances (by @vijay-wagento)
 - magento#15717: Fixed return type of wishlist's getImageData in DocBlock (by @rogyar)
 - magento#15709: [Forwardport] [Resolved : Menu widget submenu alignment magento#7897] (by @dmytro-ch)
 - magento#15707: [Forwardport] Typo correction (by @dmytro-ch)
 - magento#15706: [Forwardport] Use stored value of method instead of calling same method again. (by @dmytro-ch)
 - magento#15703: [Forwardport] Remove extra space and format the code in translation file (by @dmytro-ch)
 - magento#15701: [Forwardport] Fix HTML syntax in report.phtml error template (by @dmytro-ch)
 - magento#15665: [Forwardport] Wrong invoice prefix in multistore setup due to default store (by @vgelani)


Fixed GitHub Issues:
 - magento#7897: Menu widget submenu alignment (reported by @slackerzz) has been fixed in magento#15764 by @hitesh-wagento in 2.3-develop branch
   Related commits:
     1. ecc5f7b

 - magento#15355: Function is unnecessarily called multiple time (reported by @saurabh-aureate) has been fixed in magento#15763 by @vgelani in 2.3-develop branch
   Related commits:
     1. bcdd8f2

 - magento#15356: Refactore javascript for module URL rewrite (reported by @vgelani) has been fixed in magento#15747 by @vijay-wagento in 2.3-develop branch
   Related commits:
     1. 6711694

 - magento#13793: Submitting search form (mini) with enter key fires event handlers bound by jquery twice (reported by @koenner01) has been fixed in magento#15696 by @vgelani in 2.3-develop branch
   Related commits:
     1. 04583ac

 - magento#13415: Duplicated elements id in checkout page (reported by @angelo983) has been fixed in magento#15705 by @julienanquetil in 2.3-develop branch
   Related commits:
     1. 82d0491
     2. fbb81c9
     3. 6301ed4

 - magento#15354: Refactor javascript code of button split widget call js component (reported by @amittiwari024) has been fixed in magento#15731 by @vijay-wagento in 2.3-develop branch
   Related commits:
     1. eaa585d

 - magento#7897: Menu widget submenu alignment (reported by @slackerzz) has been fixed in magento#15709 by @dmytro-ch in 2.3-develop branch
   Related commits:
     1. 14bf8af

 - magento#14063: Wrong invoice prefix in multistore setup due to default store id (reported by @shinesoftware) has been fixed in magento#15665 by @vgelani in 2.3-develop branch
   Related commits:
     1. d5c3952
@hitesh-wagento hitesh-wagento merged commit 0b4443d into 2.3-develop Jun 5, 2018
hitesh-wagento pushed a commit that referenced this pull request Jul 12, 2018
hitesh-wagento pushed a commit that referenced this pull request Jul 14, 2018
[Forwardport] Smallest codestyle fix in Option/Type/Text.php
@hitesh-wagento hitesh-wagento deleted the 2.3-develop-PR-port-15826 branch September 6, 2018 06:57
hitesh-wagento pushed a commit that referenced this pull request Jan 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.