Changeset 1061624

Timestamp:

01/06/2015 08:45:58 PM (11 years ago)

Author:

2kblater.com

Message:

1.1.0

Location:

2kb-amazon-affiliates-store/trunk

Files:

• KbAmazonController.php (modified) (1 diff)
• KbAmazonImporter.php (modified) (2 diffs)
• lib/KbAmazonItems.php (modified) (1 diff)
• plugin.php (modified) (2 diffs)
• query.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• store_functions.php (modified) (1 diff)
• template/admin/css/default.css (modified) (1 diff)
• template/admin/importBySearch.phtml (modified) (4 diffs)
• template/admin/importItemsWithGallery.phtml (modified) (2 diffs)
• template/admin/layout.phtml (modified) (4 diffs)
• template/admin/version.phtml (modified) (1 diff)

2kb-amazon-affiliates-store/trunk/KbAmazonController.php

@@ -128 +128 @@
         $data = array();
         $importer = new KbAmazonImporter;
-        if (isset($_POST['search']) && (!empty($_POST['category']) || !empty($_POST['categoryName']))) {
-            $category = !empty($_POST['categoryName'])
-                        ? $_POST['categoryName']
-                        : $importer->getAmazonCategory($_POST['category']);
+        if (isset($_GET['search']) && (!empty($_GET['category']) || !empty($_GET['categoryName']))) {
+            $category = !empty($_GET['categoryName'])
+                        ? $_GET['categoryName']
+                        : $importer->getAmazonCategory($_GET['category']);
             
             $resultSet = $importer->search(
-                $_POST['search'],
-                $category
+                $_GET['search'],
+                $category,
+                null,
+                (isset($_GET['kbpage']) ? $_GET['kbpage'] : null)
             );
   
             if ($resultSet->isValid()) {
+                $data['resultSet'] = $resultSet;
                 $data['items'] = $resultSet->getItems();
                 $data['addItemsTemplate'] = $this->getTemplatePath('importItemsWithGallery');

2kb-amazon-affiliates-store/trunk/KbAmazonImporter.php

@@ -369 +369 @@
      * @return \KbAmazonItems
      */
-    public function search($search, $category, $nodeId = null)
+    public function search($search, $category, $nodeId = null, $page = null)
     {
         $result = getKbAmazonApi()
                   ->responseGroup('Large')
-                  ->optionalParameters(array('MerchantId' => 'All'))
+                  ->optionalParameters(array('MerchantId' => 'All', 'ItemPage' => $page))
                   ->category($category)
                   ->search($search, $nodeId);
+        
         $this->countAmazonRequest();
         return new KbAmazonItems($result, true);
@@ -850 +851 @@
     public function getUrlItems($url)
     {
+        set_time_limit(90);
         $asins = $this->getUrlAsins($url);
         $items = array();

2kb-amazon-affiliates-store/trunk/lib/KbAmazonItems.php

@@ -35 +35 @@
     }
     
+    public function getTotalResults()
+    {
+        return isset($this->result['Items']['TotalResults']) ? $this->result['Items']['TotalResults'] : 0;
+    }
+    
+    public function getTotalPages()
+    {
+        return isset($this->result['Items']['TotalPages']) ? $this->result['Items']['TotalPages'] : 0;
+    }
+    
     public function getItems()
     {

2kb-amazon-affiliates-store/trunk/plugin.php

@@ -4 +4 @@
  * Plugin URI: http://www.2kblater.com/?p=8318
  * Description: Amazon Affiliate Store Plugin With Cart, Checkout, Custom Themes. Easy to manage and setup. Sell wide range of physical and digital products imported from Amazon Affiliate API using 90 days cookie reference. This plugin is released with GPL2 license.
- * Version: 1.0.10
+ * Version: 1.1.0
  * Author: 2kblater.com
  * Author URI: http://www.2kblater.com
@@ -16 +16 @@
 }
 
-define('KbAmazonVersion', '1.0.10');
-define('KbAmazonVersionNumber', 1010);
+define('KbAmazonVersion', '1.1.0');
+define('KbAmazonVersionNumber', 110);
 define('KbAmazonStoreFolderName',  pathinfo(dirname(__FILE__), PATHINFO_FILENAME));
 define('KbAmazonStorePluginPath',  dirname(__FILE__) . '/');

2kb-amazon-affiliates-store/trunk/query.php

@@ -4 +4 @@
 && isset($_GET['check'])
 && $_GET['check'] == getKbAmz()->getSecret()) {
-    
+    set_time_limit(90);
     require_once KbAmazonStorePluginPath . 'lib/phpQuery-onefile.php';
     

2kb-amazon-affiliates-store/trunk/readme.txt

@@ -3 +3 @@
 Requires at least: 4.0
 Tested up to: 4.0
-Stable tag: 1.0.10
+Stable tag: 1.1.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -36 +36 @@
 
 == Changelog ==
-= 1.0.10 =
-isProductAvailable now only checks for new and free products to determine availability
+= 1.1.0 =
+Import timeout increased from default 30sec. to 90 sec.
+Added pagination on the search page.
 = 1.0.9 =
 kb_amz_list_products shortcode accept short code parameters with php code. Ex. [kb_amz_list_products attribute_value="<? date('Y-m-d', time() - 3600); ?>"].

2kb-amazon-affiliates-store/trunk/store_functions.php

@@ -371 +371 @@
     return implode(array_slice($parts, 0, $last_part));
 }
+
+function kbAmzBootstrapPagination($count, $perPage)
+{
+    $query = $_GET;
+
+    $curPage = isset($_GET['kbpage']) ? $_GET['kbpage'] : 1;
+    $data = array();
+    if($count){
+        $pages = ceil($count / $perPage);
+        if($pages > 1){
+
+            $page = $curPage == 1 ? 1 : $curPage - 1;
+            $query['kbpage'] = $page;
+            $data[] = \sprintf(
+                '<li%s><a href="?%s">%s</a></li>' . PHP_EOL,
+                $curPage == 1 ? ' class="disabled"' : '',
+                http_build_query($query),
+                '&laquo;'
+            );
+            $query['kbpage'] = 1;
+            $data[] = \sprintf(
+                '<li%s><a href="?%s">%s</a></li>' . PHP_EOL,
+                $curPage == 1 ? ' class="disabled first"' : ' class="first"',
+                http_build_query($query),
+                __('First')
+            );
+
+            for($i = 1; $i <= $pages; $i++) {
+                $canAdd = false;
+                if ($i >= $curPage - 5 && $i <= $curPage + 5) {
+                    $canAdd = true;
+                }
+
+                if (!$canAdd) {
+                    continue;
+                }
+                
+                $query['kbpage'] = $i;
+                $data[] = \sprintf(
+                    '<li%s><a href="?%s">%s</a></li>' . PHP_EOL,
+                    $i == $curPage ? ' class="active"' : '',
+                     http_build_query($query),
+                    $i
+                );  
+
+
+            }
+            
+            $query['kbpage'] = $pages;
+            $data[] = \sprintf(
+                '<li%s><a href="?%s">%s</a></li>' . PHP_EOL,
+                $curPage == $pages ? ' class="disabled last"' : ' class="last"',
+                http_build_query($query),
+                __('Last')
+            );
+
+            $page = $curPage == $pages ? $pages : $curPage + 1;
+            $query['kbpage'] = $page;
+            $data[] = \sprintf(
+                '<li%s><a href="?%s">%s</a></li>' . PHP_EOL,
+                $curPage == $pages ? ' class="disabled"' : '',
+                http_build_query($query),
+                '&raquo;'
+            );
+        }
+    }
+    
+    if (!empty($data)) {
+        return \sprintf(
+            '<ul class="pagination">%s</ul>' . PHP_EOL,
+            join('', $data)
+        ); 
+    }
+}
+
+function kbAmzHiddenInput()
+{
+    if (!empty($_GET)) {
+        $data = array();
+        foreach ($_GET as $name => $val) {
+            $data[] = sprintf(
+                '<input type="hidden" name="%s" value="%s"/>',
+                $name,
+                $val
+            );
+        }
+        return implode(PHP_EOL, $data);
+    }
+}

2kb-amazon-affiliates-store/trunk/template/admin/css/default.css

@@ -27 +27 @@
     height: 180px;
     overflow: hidden;
+    text-align: center;
 }
 .kb-amz-product-attributes #sortable2 input{

2kb-amazon-affiliates-store/trunk/template/admin/importBySearch.phtml

@@ -1 @@
-<form role="form" method="post">
+<form role="form" method="get">
     <div class="alert alert-success">Use Category from the select or write down your own. <a href="http://docs.aws.amazon.com/AWSECommerceService/latest/DG/BrowseNodeIDs.html" target="_blank">Check this link for amazon categories</a></div>
     <div class="row">
@@ -13 +13 @@
             <div class="form-group">
                 <label for="category" class="control-label">
-                    <?php echo __('Category'); ?>
+                    <?php echo __('Select Category'); ?>
                 </label>
                 <select name="category" class="form-control"  value="<?php echo getKbPostVar('category');?>">
@@ -23 +23 @@
             <div class="form-group">
                 <label for="categoryName" class="control-label">
-                    <?php echo __('Category Name'); ?>
+                    <?php echo __('Or Write a Category Name'); ?>
                 </label>
                 <input type="text" name="categoryName" class="form-control" value="<?php echo getKbPostVar('categoryName');?>" />
@@ -32 +32 @@
         <button type="submit" class="btn btn-primary" name="submit" value="load"><?php echo __('Search'); ?></button>
     </div>
+    <?php echo kbAmzHiddenInput(); ?>
 </form>
+
+<?php
+if ($this->resultSet) {
+    echo '<div class="form-group">';
+    echo sprintf(
+        '<span class="label label-default">%s %s %s %s %s</span>',
+        $this->resultSet->getTotalResults(),
+        __('Items'),
+        __('in'),
+        $this->resultSet->getTotalPages(),
+        __('Pages')
+    );
+    echo sprintf(
+        '&nbsp;<span class="label label-info">%s</span>',
+        __('Amazon is allowing to browse up to 10 pages of results.')
+    );
+    echo '</div>';
+}
+?>
 
 <?php

2kb-amazon-affiliates-store/trunk/template/admin/importItemsWithGallery.phtml

@@ -5 +5 @@
     <div class="row kb-amz-url-upload" id="kb-amz-categories-products">
         <?php foreach ($this->items as $item): ?>
-        <label class="col-sm-3 col-md-2">
+        <label class="col-sm-2 col-md-2">
             <div class="thumbnail">
                 <div class="import-image">
@@ -20 +20 @@
         <?php endforeach; ?>
     </div>
+    
+    <?php
+    if ($this->resultSet && $this->resultSet->getTotalResults() > 10) {
+        $number = $this->resultSet->getTotalResults();
+        echo kbAmzBootstrapPagination($number, 10);
+    }
+    ?>
     
     <div class="row">

2kb-amazon-affiliates-store/trunk/template/admin/layout.phtml

@@ -8 +8 @@
         <ul class="nav nav-tabs">
         <?php
+            $query = array(
+                'page' => $_GET['page'],
+                'kbAction' => $_GET['kbAction']
+            );
             $i = 0;
             foreach($this->actions as $action):
@@ -21 +25 @@
                             '<li class="%s"><a href="?%s">%s</a></li>',
                             $subPageAction ? 'active' : '',
-                            http_build_query(array_merge($_GET, array('kbAction' => $page['action']))),
+                            http_build_query(array_merge($query, array('kbAction' => $page['action']))),
                             $page['label']
                         );
@@ -43 +47 @@
                         '<li class="%s"><a href="?%s">%s %s</a></li>',
                         $isActive ? 'active' : '',
-                        http_build_query(array_merge($_GET, array('kbAction' => $action['action']))),
+                        http_build_query(array_merge($query, array('kbAction' => $action['action']))),
                         (isset($action['icon']) ? '<span class="glyphicon '.$action['icon'].'"></span>' : ''),
                         $action['label']
@@ -75 +79 @@
     </div>
 </div>
+<script>
+    (function ($, params) {
+        $.each(params, function (name, value) {
+            $('[name="'+name+'"]').val(value);
+        });
+    })(jQuery, <?php echo json_encode($_GET); ?>);
+</script>

2kb-amazon-affiliates-store/trunk/template/admin/version.phtml

@@ -1 +1 @@
 <div class="row" id="kb-amz-version">
     <div class="col-sm-12">
-        <h4>1.0.10</h4>
+        <h4>1.1.0</h4>
         <ul style="list-style-type: disc;">
-            <li>isProductAvailable now only checks for new and free products to determine availability</li>
+            <li>Import timeout increased from default 30sec. to 90 sec.</li>
+            <li>Added pagination on the <a href="?page=kbAmz&kbAction=importBySearch">search page</a>.</li>
         </ul>
         <h4>1.0.9</h4>