Fix prefixed tables on join queries

bymayo · Oct 15, 2018 · 14acd7e · 14acd7e
1 parent da6a483
commit 14acd7e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Commerce Widgets Changelog
 
+## 2.0.7 - 2018-10-15
+### Fixed
+- Fix prefixed tables on join queries [#9](https://github.com/bymayo/craft-commerce-widgets/issues/9)
+
 ## 2.0.6 - 2018-10-14
 ### Fixed
 - Fix prefixed tables [#9](https://github.com/bymayo/craft-commerce-widgets/issues/9)

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "bymayo/commerce-widgets",
     "description": "Insightful dashboard widgets for your Craft Commerce 2 store.",
     "type": "craft-plugin",
-    "version": "2.0.6",
+    "version": "2.0.7",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/widgets/SubscriptionPlans.php b/src/widgets/SubscriptionPlans.php
@@ -68,7 +68,7 @@ public function getSubscriptionPlans()
                ]
             )
             ->join(
-               'LEFT JOIN', 'commerce_subscriptions subscriptions', 'subscriptions.planId = plans.id'
+               'LEFT JOIN', '{{%commerce_subscriptions}} subscriptions', 'subscriptions.planId = plans.id'
             )
             ->where(
                [

diff --git a/src/widgets/TopCustomers.php b/src/widgets/TopCustomers.php
@@ -74,7 +74,7 @@ public function getCustomers()
          if($this->includeGuests == 'no')
          {
             $query
-               ->join('INNER JOIN', 'commerce_customers customers', 'orders.customerId = customers.id')
+               ->join('INNER JOIN', '{{%commerce_customers}} customers', 'orders.customerId = customers.id')
                ->andWhere(['not', ['customers.userId' => null]]);
          }
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,7 +68,7 @@ public function getSubscriptionPlans() @@
                    ]
                 )
                 ->join(
-                   'LEFT JOIN', 'commerce_subscriptions subscriptions', 'subscriptions.planId = plans.id'
+                   'LEFT JOIN', '{{%commerce_subscriptions}} subscriptions', 'subscriptions.planId = plans.id'
                 )
                 ->where(
                    [
@@ Expand Down @@