Added pagination to dashboard

Author: mylesthedev

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes for Abandoned Cart
 
+## 1.1.1 - 2019-03-23
+### Added
+- Added pagination to the dashboard to handle sites with large amounts of orders
+
 ## 1.1.0 - 2019-03-19
 ### Added
 - You can now manually trigger the job that searches for abandoned carts! Useful if you don't have access to cron jobs

composer.json

@@ -2,7 +2,7 @@
     "name": "mediabeastnz/craft-commerce-abandoned-cart",
     "description": "Abandoned Cart plugin for Craft Commerce 2",
     "type": "craft-plugin",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "keywords": [
         "craft",
         "cms",

src/controllers/BaseController.php

@@ -7,11 +7,17 @@
 namespace mediabeastnz\abandonedcart\controllers;
 
 use mediabeastnz\abandonedcart\AbandonedCart;
+use mediabeastnz\abandonedcart\records\AbandonedCart as CartRecord;
+use mediabeastnz\abandonedcart\models\AbandonedCart as CartModel;
+
 
 use Craft;
 use craft\web\Controller;
 use craft\helpers\UrlHelper;
 use craft\commerce\elements\Order;
+use craft\db\Paginator;
+use craft\db\Query;
+use craft\web\twig\variables\Paginate;
 
 use yii\web\Response;
 
@@ -37,13 +43,44 @@ public function actionSettings()
 
     public function actionIndex()
     {
-        $carts = AbandonedCart::$plugin->carts->getAbandonedCarts(25);
-        return $this->renderTemplate('abandoned-cart/index', array(
-            'carts' => $carts,
-            'totalCarts' => AbandonedCart::$plugin->carts->getAbandonedCartsTotal(),
-            'totalRecovered' => AbandonedCart::$plugin->carts->getAbandonedCartsRecovered(),
-            'conversionRate' => AbandonedCart::$plugin->carts->getAbandondedCartsConversion()
-        ));
+        $c = new Query();
+        $c->select('*')->from(['{{%abandonedcart_carts}}'])->orderBy('dateUpdated desc');
+        $paginator = new Paginator($c, [
+            'pageSize' => 20,
+            'currentPage' => \Craft::$app->request->pageNum,
+        ]);
+        
+        $pageResults = $paginator->getPageResults();
+        if($pageResults && count($pageResults)) {
+            $carts = [];
+            foreach ($pageResults as $pageResult) {
+                $carts[] = new CartModel($pageResult);
+            }
+
+            $pageOffset = $paginator->getPageOffset();
+            $page = Paginate::create($paginator);
+
+            return $this->renderTemplate('abandoned-cart/index', [
+                'carts' => $carts,
+                'pageInfo' => [
+                    'first' => $pageOffset + 1,
+                    'last' => $pageOffset + count($pageResults),
+                    'total' => $paginator->getTotalResults(),
+                    'currentPage' => $paginator->getCurrentPage(),
+                    'totalPages' => $paginator->getTotalPages(),
+                    'prevUrl' => $page->getPrevUrl(),
+                    'nextUrl' => $page->getNextUrl(),
+                ],
+                'totalRecovered' => AbandonedCart::$plugin->carts->getAbandonedCartsRecovered(),
+                'conversionRate' => AbandonedCart::$plugin->carts->getAbandondedCartsConversion()
+            ]);
+        } else {
+            return $this->renderTemplate('abandoned-cart/index', [
+                'carts' => false,
+                'totalRecovered' => AbandonedCart::$plugin->carts->getAbandonedCartsRecovered(),
+                'conversionRate' => AbandonedCart::$plugin->carts->getAbandondedCartsConversion()
+            ]);
+        }  
     }
 
     public function actionFindCarts()

src/models/AbandonedCart.php

@@ -7,7 +7,6 @@
 namespace mediabeastnz\abandonedcart\models;
 
 use mediabeastnz\abandonedcart\AbandonedCart as Plugin;
-use mediabeastnz\abandonedcart\records\AbandonedCart as CartRecord;
 
 use craft\base\Model;
 use craft\validators\HandleValidator;

src/templates/index.twig

@@ -30,7 +30,6 @@
                         If a new cart is found it will be marked as scheduled and added to the queue.<br />
                         Items in the queue will be scheduled as per your settings.
                         </p>
-                        {% if carts|length %}<p><em>Showing the last {{ carts|length }} out of {{ totalCarts }}</em></p>{% endif %}
                     </div>
                 </div>
             </div>
@@ -49,8 +48,6 @@
 
     {% if carts | length %}
 
-        {% set abandonedCarts = carts %}
-
         <table id="carts" class="data fullwidth collapsible">
             <thead>
                 <th scope="col">{{ "Cart" | t('app') }}</th>
@@ -60,10 +57,11 @@
                 <th scope="col">{{ "2nd Reminder" | t('app') }}</th>
                 <th scope="col">{{ "Clicked" | t('app') }}</th>
                 <th scope="col">{{ "Status" | t('app') }}</th>
+                <th scope="col">{{ "Updated" | t('app') }}</th>
             </thead>
             <tbody>
-                {% for cart in abandonedCarts %}
-                    <tr data-id="{{ cart.id }}" data-name="{{ cart.order[0].reference | t('site') }}">
+                {% for cart in carts %}
+                    <tr data-id="{{ cart.id }}" data-name="{{ cart.order[0].reference | t('site') }}" style="font-size: 13px;">
                         <td scope="row" data-title="{{ 'Order' | t('app') }}">
                             <a class="nav-anchor" href="{{ url('commerce/orders/' ~ cart.order[0].id) }}">{{ "View" | t('app') }}</a>
                         </td>
@@ -115,10 +113,14 @@
 
                             {{ status }}
                         </td>
+                        <td scope="row" data-title="{{ 'Order' | t('app') }}">
+                            {{cart.dateUpdated.nice}}
+                        </td>
                     </tr>
                 {% endfor %}
             </tbody>
         </table>
+        {% include "_includes/pagination" %}
     {% endif %}
 
 {% endset %}