Merge branch 'dev-1.1.4' into 'master'

fixed option name

See merge request iamapinan/woocommerce-line-notify!16

Author: apinandev

.gitignore

@@ -1 +1,3 @@
-repos/
+logs/*
+vendor/
+*.lock

inc/Actions.php

@@ -97,7 +97,7 @@ public function thai_states( $states ) {
      */
     public function send_notify($msg, $source = 'local') {
         // Get plugin options
-        $get_option = get_option( '_option_notify' );
+        $get_option = get_option( '_option_name' );
         $get_debug = get_option( '_option_debug' );
         $counter = get_option('wln_source_' . $source);
         $endpoint = get_option('wln-api-endpoint');

inc/LineNotifyAdmin.php

@@ -155,7 +155,7 @@ public function NotificationTrigger( $order_id ) {
         $order_data = $order->get_data(); // The Order data
 
         // Get plugin options
-        $get_option = get_option( '_option_notify' );
+        $get_option = get_option( '_option_name' );
 
         // Check notify rule
         $availableStatus = json_decode( $get_option['status'] );
@@ -257,7 +257,7 @@ public function Wln_Page_Init() {
         // Notification setting
         register_setting(
             '_notification_group', // option_group
-            '_option_notify', // option_name
+            '_option_name', // option_name
             array( $this, 'noti_sanitize' ) // sanitize_callback
         );
         add_settings_section(
@@ -294,7 +294,7 @@ public function Wln_Page_Init() {
         // About
         register_setting(
             '_about_group', // option_group
-            '_option_notify' // option_name
+            '_option_name' // option_name
             // array( $this, '_sanitize' ) // sanitize_callback
         );
         add_settings_section(
@@ -310,7 +310,7 @@ public function _section_info() {
 
         switch ( $active_tab ) {
             case 'notification_setting':
-                $this->options = get_option( '_option_notify' );
+                $this->options = get_option( '_option_name' );
                 echo __('Order notification setting','woo-line-notify');
                 add_settings_field(
                     'endpoint', // id
@@ -480,7 +480,7 @@ public function api_callback() {
     }
     public function token_callback() {
         printf(
-            '<input class="regular-text" type="password" name="_option_notify[token]" id="token" value="%s" required> <a href="https://notify-bot.line.me/my/" target="_blank" class="button button-secondary">' . __('Create Token', 'woo-line-notify') . '</a>',
+            '<input class="regular-text" type="password" name="_option_name[token]" id="token" value="%s" required> <a href="https://notify-bot.line.me/my/" target="_blank" class="button button-secondary">' . __('Create Token', 'woo-line-notify') . '</a>',
             isset( $this->options['token'] ) ? esc_attr( $this->options['token']) : ''
         );
     }
@@ -495,7 +495,7 @@ public function endpoint_callback() {
 
     public function pattern_callback() {
         printf(
-            '<textarea class="large-text" maxlength="500" placeholder="' . __('You have new order on', 'woo-line-notify') . ' [order_status]" rows="5" name="_option_notify[pattern]" id="pattern" style="max-width: 580px;height: 200px;">%s</textarea>
+            '<textarea class="large-text" maxlength="500" placeholder="' . __('You have new order on', 'woo-line-notify') . ' [order_status]" rows="5" name="_option_name[pattern]" id="pattern" style="max-width: 580px;height: 200px;">%s</textarea>
             <p>
                 <a href="" class="button button-secondary" id="add_default_pattern">' . __('Use default value', 'woo-line-notify') . '</a>
             </p>
@@ -527,7 +527,7 @@ public function order_status_callback() {
             $orderStatus = wc_get_order_statuses();
             foreach($orderStatus as $sid => $sv) {
                 $check = @(in_array($sid, $statusSelected)) ? 'checked' : '';
-                echo "<p><span class='order_status_check'><input type='checkbox' name='_option_notify[status][]' $check value='$sid' id='status_$sid'> <label for='status_$sid'>$sv</label></span>&nbsp;&nbsp;</p>";
+                echo "<p><span class='order_status_check'><input type='checkbox' name='_option_name[status][]' $check value='$sid' id='status_$sid'> <label for='status_$sid'>$sv</label></span>&nbsp;&nbsp;</p>";
             }
         } else {
             echo __("<p>Please install and activate <a href='https://th.wordpress.org/plugins/woocommerce/'>Woocommerce</a> to use this feature.</p>", 'woo-line-notify');

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://paypal.me/apinu
 Tags: woocommerce line notify, woo line notify, woo-line-notify, notification, line notification, line notify, woocommerce, notify, messager, alert, order, line, line bot
 Requires at least: 4.8
 Tested up to: 5.2.2
-Stable tag: 1.1.1
+Stable tag: 1.1.4
 Requires PHP: 7.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -124,9 +124,9 @@ To send message via static method just put your message to the method like below
 == REST API ==
 URL: domain/wp-json/woo-line-notify/v1/notify
 METHOD: POST
-PARAMETERS: `message` <Your message to send>
+PARAMETERS: `message` Your message to send
 Authentication: Basic Authen
-USERNAME/PASSWORD: <API Key>:<API_Key>
+USERNAME/PASSWORD: API Key:API_Key
 
 = For example. =
 Send post request to `http://localhost/wp-json/woo-line-notify/v1/notify` you must be send parameter `message` by form/data and add Authenticate to header with value `Basic base64_encode( some_api_key_from_api_option:some_api_key_from_api_option )`
@@ -153,6 +153,12 @@ Yes you can do it by adding shortcode [product] to your message pattern.
 5. Dashboard widget.
 
 == Changelog ==
+= 1.1.4 =
+- fixed action
+= 1.1.3 =
+- update version
+= 1.1.2 =
+- fixed old value missing.
 = 1.1.1 =
 - add code
 

woo-line-notify.php

@@ -3,7 +3,7 @@
 Plugin Name: Woocommerce Line Notify
 Plugin URI: https://git.iotech.co.th/iamapinan/woocommerce-line-notify
 Description: Woocommerce new order notify to line chat.
-Version: 1.1.1
+Version: 1.1.4
 Author: Apinan Woratrakun
 Author URI: https://facebook.com/9apinan
 License: GNU General Public License v3.0