Merge pull request #40 from mageplaza/2.4-develop

2.4 develop

Block/Dashboard/AbstractClass.php

@@ -325,7 +325,7 @@ protected function getChartDataLabel()
 
         return [
             date('Y-m-d', strtotime($date[0])) . ' to ' . date('Y-m-d', strtotime($date[1])),
-            date('Y-m-d', strtotime($date[2])) . ' to ' . date('Y-m-d', strtotime($date[3]))
+            date('Y-m-d', strtotime($date[2] ?? '')) . ' to ' . date('Y-m-d', strtotime($date[3] ?? ''))
         ];
     }
 

Helper/Data.php

@@ -203,6 +203,7 @@ public function formatDate($format, $date)
      */
     public function getDateTimeRangeFormat($startDate, $endDate = null, $isConvertToLocalTime = null, $format = null)
     {
+        $startDate = $startDate ? : '';
         $endDate   = (new \DateTime($endDate ?: $startDate, new DateTimeZone($this->getTimezone())))->setTime(
             23,
             59,
@@ -439,7 +440,7 @@ public function getTotalsByDateRange($startDate, $endDate)
         if ($this->_request->getParam('card_id') === 'tax') {
             return $collection;
         }
-        
+
         return $collection->getFirstItem();
     }
 

composer.json

@@ -2,10 +2,10 @@
   "name": "mageplaza/module-reports",
   "description": "Magento 2 Reports Extension",
   "require": {
-    "mageplaza/module-core": "^1.4.12"
+    "mageplaza/module-core": "^1.5.3"
   },
   "type": "magento2-module",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "license": "proprietary",
   "authors": [
     {

i18n/en_US.csv

@@ -1,61 +1,64 @@
-"Average Order","Average Order"
-"Average Order Value","Average Order Value"
-Bestsellers,Bestsellers
-"Conversion Funnel","Conversion Funnel"
-Customers,Customers
-"Last Order","Last Order"
-"Last Search Terms","Last Search Terms"
-"Lifetime Sales","Lifetime Sales"
-"Most Viewed Products","Most Viewed Products"
-"New Customers","New Customers"
-Orders,Orders
-first,first
-repeat,repeat
-"Repeat Customer Rate","Repeat Customer Rate"
-"Sales By Location","Sales By Location"
-Shipping,Shipping
-Tax,Tax
-"Top Search Terms","Top Search Terms"
-Totals,Totals
-"Can not be load Card","Can not be load Card"
-Dashboard,Dashboard
-"All Websites","All Websites"
-"compare with","compare with"
-Card,Card
-"Please upgrade to %1 version to see more detail","Please upgrade to %1 version to see more detail"
-"View Details","View Details"
-"Something went wrong while loading %1 card","Something went wrong while loading %1 card"
-"Chart is disabled. To enable the chart, click <a href='%1'>here</a>","Chart is disabled. To enable the chart, click <a href='%1'>here</a>"
-"Product Viewed: %1","Product Viewed: %1"
-"Add To Cart: %1","Add To Cart: %1"
-"Ordered: %1","Ordered: %1"
-"We couldn't find any records.","We couldn't find any records."
-Period,Period
-Day,Day
-Week,Week
-Month,Month
-Year,Year
-"Order Status","Order Status"
---Select--,--Select--
-"Date Used","Date Used"
-"Created At","Created At"
-"Updated At","Updated At"
-"Let’s experience your new dashboard","Let’s experience your new dashboard"
-"Hello there! Better reports are available","Hello there! Better reports are available"
-"Mageplaza Advanced Reporting","Mageplaza Advanced Reporting"
-"The better reports provides ecommerce insights across performance metrics, product sales, customers, and cost of goods sold. Instantly measure metrics like customer lifetime value, gross margin, net profit, and more to build and automate high-quality ecommerce reports.","The better reports provides ecommerce insights across performance metrics, product sales, customers, and cost of goods sold. Instantly measure metrics like customer lifetime value, gross margin, net profit, and more to build and automate high-quality ecommerce reports."
-"Try to use new Dashboard","Try to use new Dashboard"
-"Change Key","Change Key"
-"Generate Url","Generate Url"
-Copied!,Copied!
-Continue,Continue
-"Mageplaza Reports Dashboard","Mageplaza Reports Dashboard"
-Reports,Reports
-"General Configuration","General Configuration"
-"Module Enable","Module Enable"
-"Enable Dashboard","Enable Dashboard"
-"Enable Chart","Enable Chart"
-"Enable Comparison","Enable Comparison"
-"Mobile Dashboard","Mobile Dashboard"
-"Access Key","Access Key"
-"You must save config to apply change.","You must save config to apply change."
+"Average Order","Average Order"
+"Average Order Value","Average Order Value"
+Bestsellers,Bestsellers
+"Conversion Funnel","Conversion Funnel"
+Customers,Customers
+"Last Order","Last Order"
+"Last Search Terms","Last Search Terms"
+"Lifetime Sales","Lifetime Sales"
+"Most Viewed Products","Most Viewed Products"
+"New Customers","New Customers"
+Orders,Orders
+first,first
+repeat,repeat
+"Repeat Customer Rate","Repeat Customer Rate"
+"Sales By Location","Sales By Location"
+Shipping,Shipping
+Tax,Tax
+"Top Search Terms","Top Search Terms"
+Totals,Totals
+"Can not be load Card","Can not be load Card"
+Dashboard,Dashboard
+"All Websites","All Websites"
+"compare with","compare with"
+Card,Card
+"Please upgrade to %1 version to see more detail","Please upgrade to %1 version to see more detail"
+"View Details","View Details"
+"Something went wrong while loading %1 card","Something went wrong while loading %1 card"
+"Chart is disabled. To enable the chart, click <a href='%1'>here</a>","Chart is disabled. To enable the chart, click <a href='%1'>here</a>"
+"Product Viewed: %1","Product Viewed: %1"
+"Add To Cart: %1","Add To Cart: %1"
+"Ordered: %1","Ordered: %1"
+"We couldn't find any records.","We couldn't find any records."
+Period,Period
+Day,Day
+Week,Week
+Month,Month
+Year,Year
+"Order Status","Order Status"
+--Select--,--Select--
+"Date Used","Date Used"
+"Created At","Created At"
+"Updated At","Updated At"
+"Let’s experience your new dashboard","Let’s experience your new dashboard"
+"Hello there! Better reports are available","Hello there! Better reports are available"
+Scope:,Scope:
+"Stores Configuration","Stores Configuration"
+"Mageplaza Advanced Reporting","Mageplaza Advanced Reporting"
+"The better reports provides ecommerce insights across performance metrics, product sales, customers, and cost of goods sold. Instantly measure metrics like customer lifetime value, gross margin, net profit, and more to build and automate high-quality ecommerce reports.","The better reports provides ecommerce insights across performance metrics, product sales, customers, and cost of goods sold. Instantly measure metrics like customer lifetime value, gross margin, net profit, and more to build and automate high-quality ecommerce reports."
+"Try to use new Dashboard","Try to use new Dashboard"
+"Change Key","Change Key"
+"Generate Url","Generate Url"
+Copied!,Copied!
+Continue,Continue
+"Please confirm scope switching. All data that hasn't been saved will be lost.","Please confirm scope switching. All data that hasn't been saved will be lost."
+"Mageplaza Reports Dashboard","Mageplaza Reports Dashboard"
+Reports,Reports
+"General Configuration","General Configuration"
+"Module Enable","Module Enable"
+"Enable Dashboard","Enable Dashboard"
+"Enable Chart","Enable Chart"
+"Enable Comparison","Enable Comparison"
+"Mobile Dashboard","Mobile Dashboard"
+"Access Key","Access Key"
+"You must save config to apply change.","You must save config to apply change."