Changeset 1065841

Timestamp:

01/12/2015 12:15:09 PM (11 years ago)

Author:

2kblater.com

Message:

1.1.3

Location:

2kb-amazon-affiliates-store/trunk

Files:

• KbAmazonController.php (modified) (2 diffs)
• KbAmazonStore.php (modified) (4 diffs)
• KbTemplate.php (modified) (1 diff)
• plugin.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• store_widgets.php (modified) (1 diff)
• template/admin/css/default.css (modified) (2 diffs)
• template/admin/img/info (added)
• template/admin/img/info/attributes.jpg (added)
• template/admin/img/info/best-sellers-slider.jpg (added)
• template/admin/img/info/binding-attributes-count.jpg (added)
• template/admin/img/info/images-hover.jpg (added)
• template/admin/img/info/price-discount.jpg (added)
• template/admin/img/info/price-slider.jpg (added)
• template/admin/info.phtml (added)
• template/admin/version.phtml (modified) (1 diff)
• template/default/css/style.css (modified) (2 diffs)

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

@@ -490 +490 @@
         return new KbView($data);
     }
-
-    protected function getActions() {
+    
+    public function infoAction()
+    {
+        $data = array();
+        
+        return new KbView($data);
+    }
+
+        protected function getActions() {
         return array(
             array(
@@ -547 +554 @@
                 'label' => __('Support')
             ),
-//            array(
-//                'action' => 'info',
-//                'icon' => 'glyphicon-info-sign',
-//                'label' => __('Info & FAQ')
-//            ),
+            array(
+                'action' => 'info',
+                'icon' => 'glyphicon glyphicon-folder-open',
+                'label' => __('Docs & FAQ')
+            ),
             array(
                 'action' => 'version',

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

@@ -196 +196 @@
     public function getCheckoutPage()
     {
+        $pageIdOption = $this->getOption('CheckoutPage');
+        if ($pageIdOption) {
+            $page = get_page($pageIdOption);
+            if ($page) {
+                return $page;
+            }
+        }
         $args = array(
             'meta_key' => 'KbAmzCheckoutPage',
@@ -213 +220 @@
             ));
             add_post_meta($pageId, 'KbAmzCheckoutPage', '1');
+            $this->setOption('CheckoutPage', $pageId);
+        }
+        if (!$pageIdOption) {
+            $this->setOption('CheckoutPage', $page->ID);
         }
         return $page;
@@ -687 +698 @@
         && $lowest && $lowest != $price) {
             return sprintf(
-                '<del>%s</del><ins>%s</ins>',
+                '<del>%s</del>&nbsp;<ins>%s</ins>',
                 $price,
                 $lowest
@@ -697 +708 @@
             && $listPrice != $price) {
                 return sprintf(
-                    '<del>%s</del><ins>%s</ins>',
+                    '<del>%s</del>&nbsp;<ins>%s</ins>',
                     $listPrice,
                     $price

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

@@ -92 +92 @@
     public function initDefaultAdminScripts()
     {
+        wp_enqueue_style(
+            'KbAmzAdminDefaultCss',
+            getKbPluginUrl() . '/template/admin/css/default.css'
+        );
+        
         if (is_admin() && (!isset($_GET['page']) || $_GET['page'] != 'kbAmz')) {
             return;
         }
         
-        wp_enqueue_style(
-            'KbAmzAdminDefaultCss',
-            getKbPluginUrl() . '/template/admin/css/default.css'
-        );
-
         wp_enqueue_script(
             'KbAmzAdminJqueryUI',

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.1.2
+ * Version: 1.1.3
  * Author: 2kblater.com
  * Author URI: http://www.2kblater.com
@@ -16 +16 @@
 }
 
-define('KbAmazonVersion', '1.1.2');
-define('KbAmazonVersionNumber', 112);
+define('KbAmazonVersion', '1.1.3');
+define('KbAmazonVersionNumber', 113);
 define('KbAmazonStoreFolderName',  pathinfo(dirname(__FILE__), PATHINFO_FILENAME));
 define('KbAmazonStorePluginPath',  dirname(__FILE__) . '/');

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

@@ -2 +2 @@
 Tags: amazon, affiliate, associate, online store, selling products
 Requires at least: 4.0
-Tested up to: 4.0
-Stable tag: 1.1.0
+Tested up to: 4.1
+Stable tag: 1.1.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -36 +36 @@
 
 == Changelog ==
+= 1.1.3 =
+Fixed bug for creating multiple checkout pages.
+Fixed bug with listing price option. Now showing listing price and discounted price.
+Admin widgets css update.
+Documentation added.
 = 1.1.2 =
 Listing price add when 'Show the original price of the product.' options is enabled.

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

@@ -40 +40 @@
         <p>
             <label for="<?php echo $this->get_field_id('meta_key'); ?>"><?php _e('Meta Key:'); ?></label> 
-            <select id="<?php echo $this->get_field_id('meta_key'); ?>" name="<?php echo $this->get_field_name('meta_key'); ?>" type="text" value="<?php echo esc_attr($metaKey); ?>" style="max-width: 100%;">
+            <select id="<?php echo $this->get_field_id('meta_key'); ?>" name="<?php echo $this->get_field_name('meta_key'); ?>" type="text" value="<?php echo esc_attr($metaKey); ?>" style="width: 100%;">
                 <?php foreach (getKbAmz()->getAttributes() as $name => $type) : ?>
                 <option value="<?php echo $name; ?>"<?php echo $metaKey == $name ? 'selected="selected"' : ''?>><?php echo $type; ?></option>

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

@@ -65 +65 @@
     width: 100%;
 }
-#kb-amz-version ul, #kb-amz-version li{
+#kb-amz-version ul, #kb-amz-version li, .infoAction #kb-amz-content li{
     list-style-type: disc;
 }
-#kb-amz-version ul{
+#kb-amz-version ul, .infoAction #kb-amz-content ul{
     padding-left: 15px;
 }
@@ -79 +79 @@
     margin-bottom: 5px;
 }
+.info-items a{
+    display: block;
+}

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.1.3</h4>
+        <ul style="list-style-type: disc;">
+            <li>Fixed bug for creating multiple checkout pages.</li>
+            <li>Fixed bug with listing price option. Now showing listing price and discounted price.</li>
+            <li>Admin widgets css update.</li>
+            <li><a href="?page=kbAmz&kbAction=info">Documentation</a> added.</li>
+        </ul>
         <h4>1.1.2</h4>
         <ul style="list-style-type: disc;">

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

@@ -184 +184 @@
     overflow: hidden;
     max-height: 100%;
+    width: 100%;
 }
 .kb-amz-item-list-content{
@@ -209 +210 @@
 }
 .kb-amz-item-price del{
-    font-size:0.60em;
+    font-size:0.70em;
     opacity: 0.50;
     text-decoration: line-through;