Fixed issue with dates and trim product titles

bymayo · Jul 10, 2019 · 79f8eff · 79f8eff
1 parent bcb6a71
commit 79f8eff
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Commerce Widgets Changelog
 
+## 2.0.16 - 2019-07-10
+### Fixed
+- Completed carts value on `CartAbandonment` widget not grouped by month and year, not just month
+- The 'Today' value now matches the current day, not the first day of the week on `TotalRevenueOrders` widget
+
+### Changed
+- Product titles now trim if they are above 40 characters
+
 ## 2.0.15 - 2019-06-03
 ### Fixed
 - Fixed step count issue by removing step value on `CartAbandonment` widget

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.15",
+    "version": "2.0.16",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/templates/widgets/ProductsRecent/body.twig b/src/templates/widgets/ProductsRecent/body.twig
@@ -19,7 +19,7 @@
                      <div class="label">
                         <span class="title">
                            <a href="{{ product.cpEditUrl }}">
-                              {{ product.title }}
+                              {{ product.title|length > 40 ? product.title|slice(0, 40) ~ '...' : product.title }}
                            </a>
                         </span>
                      </div>

diff --git a/src/templates/widgets/ProductsTop/body.twig b/src/templates/widgets/ProductsTop/body.twig
@@ -27,7 +27,7 @@
                      <div class="label">
                         <span class="title">
                            <a href="{{ element.cpEditUrl }}">
-                              {{ element.title }}
+                              {{ element.title|length > 40 ? element.title|slice(0, 40) ~ '...' : element.title }}
                            </a>
                         </span>
                      </div>

diff --git a/src/widgets/CartAbandonment.php b/src/widgets/CartAbandonment.php
@@ -128,7 +128,7 @@ public function getCartTotalRevenue($isCompleted)
             ->where(
                [
                   'orders.isCompleted' => $isCompleted,
-                  'MONTH(orders.dateCreated)' => date('n')
+                  'DATE_FORMAT(orders.dateCreated, "%c-%Y")' => date('n-Y')
                ]
             );
 

diff --git a/src/widgets/TotalRevenueOrders.php b/src/widgets/TotalRevenueOrders.php
@@ -47,7 +47,7 @@ public function getTimeFrames()
       return array(
          array(
             'label' => 'Today',
-            'date' => date('d M Y', strtotime('monday this week'))
+            'date' => date('d M Y')
          ),
          array(
             'label' => 'Week',