Merge pull request #2 from anttiviljami/master

Update to v1.2.0

Author: syedabuthahirm

includes/class-woocommerce-custom-availability-tab.php

@@ -0,0 +1,56 @@
+<?php
+
+class Woocommerce_Custom_Availability_Section {
+
+    public function __construct() {
+        add_filter( 'woocommerce_get_sections_products', array( $this, 'wcslider_add_section' ) );
+        add_filter( 'woocommerce_get_settings_products', array( $this, 'wcslider_all_settings' ), 10, 2 );
+    }
+
+    /**
+     * Create the section beneath the products tab
+     **/
+    public function wcslider_add_section( $sections ) {
+        $sections['custom_availability'] = __( 'Custom Availability', 'woocommerce-custom-availability' );
+        return $sections;
+    }
+
+    /**
+     * Add settings to the specific section we created before
+     */
+    public function wcslider_all_settings( $settings, $current_section ) {
+        if ( $current_section === 'custom_availability' ) {
+            $settings_slider = array();
+            // Add Title to the Settings
+            $settings_slider[] = array(
+                'name' => __( 'Custom Availability Settings', 'woocommerce-custom-availability' ),
+                'type' => 'title',
+                'id' => 'custom_availability',
+            );
+
+            $settings_slider[] = array(
+                'name'     => __( 'Include Woocommerce Default Availability', 'woocommerce-custom-availability' ),
+                'desc_tip' => __(
+                                    'This will add default woocommerce availability 
+                                    message with our custom availability message.',
+                                    'woocommerce-custom-availability'
+                                ),
+                'id'       => '_wca_include_woocommerce_availability',
+                'type'     => 'checkbox',
+                'css'      => 'min-width:300px;',
+                'desc'     => __( 'Include Woocommerce Default Availability', 'woocommerce-custom-availability' ),
+            );
+
+            $settings_slider[] = array(
+                'type' => 'sectionend',
+                'id' => 'custom_availability',
+            );
+            return $settings_slider;
+        } else {
+            return $settings;
+        }
+    }
+
+}
+
+$woocommerce_custom_availability_section = new Woocommerce_Custom_Availability_Section();

readme.txt

@@ -4,7 +4,7 @@ Tags: Woocommerce, Custom, Availability
 Donate link: https://github.com/anttiviljami
 Requires at least: 4.3.1
 Tested up to: 4.8.2
-Stable tag: 1.1.0
+Stable tag: 1.2.0
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 

woocommerce-custom-availability.php

@@ -3,7 +3,7 @@
  * Plugin name: WooCommerce Custom Availability
  * Plugin URI: https://github.com/anttiviljami/woocommerce-custom-availability
  * Description: Set custom availability for products
- * Version: 1.1.0
+ * Version: 1.2.0
  * Author: @anttiviljami
  * Author: https://github.com/anttiviljami
  * License: GPLv3
@@ -70,12 +70,13 @@ private function __construct() {
   public function includes() {
     require_once plugin_dir_path( __FILE__ ) . 'includes/class-woocommerce-custom-availability-list-table.php';
     require_once plugin_dir_path( __FILE__ ) . 'includes/class-woocommerce-custom-availability-page.php';
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-woocommerce-custom-availability-tab.php';
   }
 
   /**
    * Load our textdomain
    */
-  function load_our_textdomain() {
+  public function load_our_textdomain() {
     load_plugin_textdomain( 'woocommerce-custom-availability', false, dirname( plugin_basename( __FILE__ ) ) . '/lang/' );
   }
 
@@ -161,7 +162,11 @@ public function custom_availability( $availability, $product ) {
 
     if ( ! empty( $custom_availability ) ) {
       $availability['class'] = 'custom-availability';
-      $availability['availability'] = esc_attr( $custom_availability );
+      if ( get_option( '_wca_include_woocommerce_availability', 'no' ) === 'yes' ) {
+        $availability['availability'] .= ' <span>' . esc_attr( $custom_availability ) . '</span>';
+      } else {
+        $availability['availability'] = esc_attr( $custom_availability );
+      }
     }
     return $availability;
   }