Context Navigation

← Previous Changeset
Next Changeset →

Changeset 2488399

Timestamp:

03/06/2021 12:09:40 PM (5 years ago)

Author:

sendbox

Message:

updated version with bug fixes

Location:

sendbox-shipping/trunk

Files:

: 8 edited

README.txt (modified) (1 diff)
admin/class-wooss-admin.php (modified) (21 diffs)
admin/js/wooss-admin.js (modified) (1 diff)
includes/assets/js/script.js (modified) (8 diffs)
includes/class-wooss-sendbox-shipping-api.php (modified) (5 diffs)
includes/class-wooss-shipping-method.php (modified) (24 diffs)
public/class-wooss-public.php (modified) (1 diff)
wooss.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

sendbox-shipping/trunk/README.txt

-                      r2430842
+                      r2488399
 <p>bugs fixes and JS upgrade to use jqueryserilize</p>
+<b>3.3.0</b>
+<p>bug fixes </p>

sendbox-shipping/trunk/admin/class-wooss-admin.php

-                      r2430827
+                      r2488399
  * @author     jastrup <jhaastrup21@gmail.com>
  */
 class Wooss_Admin
+{
+class Wooss_Admin {
 …
      * @param      string $version    The version of this plugin.
      */
+    public function __construct($plugin_name, $version)
+    {
+    public function __construct( $plugin_name, $version ) {
         $this->plugin_name = $plugin_name;
 …
      * @since    1.0.0
      */
+    public function enqueue_styles()
+    {
+    public function enqueue_styles() {
         /**
+           * This function is provided for demonstration purposes only.
+           *
+           * An instance of this class should be passed to the run() function
+           * defined in wooss_Loader as all of the hooks are defined
+           * in that particular class.
+           *
+           * The wooss_Loader will then create the relationship
+           * between the defined hooks and the functions defined in this
+           * class.
+           */
+        wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wooss-admin.css', array(), $this->version, 'all' );
+        wp_enqueue_style( 'wooss-select2', 'https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css', array(), $this->version, 'all' );
+        wp_enqueue_style( 'wooss_shipping_methods_css_styles', plugin_dir_url( __FILE__ ) . '../includes/assets/css/styles.css', array(), $this->version, 'all' );
+    }
+    /**
+     * Register the JavaScript for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+         /**
          * This function is provided for demonstration purposes only.
+         *
 …
          * class.
          */
+        wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__) . 'css/wooss-admin.css', array(), $this->version, 'all');
+        wp_enqueue_style('wooss_shipping_methods_css_styles', plugin_dir_url(__FILE__) . '../includes/assets/css/styles.css', array(), $this->version, 'all');
+    }
+    /**
+     * Register the JavaScript for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts()
+    {
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in wooss_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The wooss_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+        wp_enqueue_script('jquery-ui-dialog');
+        wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__) . 'js/wooss-admin.js', array('jquery'), $this->version, false);
+        wp_enqueue_script( 'jquery-ui-dialog' );
+        wp_enqueue_script( "wooss-select2", 'https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js', array( 'jquery' ), $this->version, false );
+        wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wooss-admin.js', array( 'jquery', 'wooss-select2' ), $this->version, false );
         wp_localize_script(
             $this->plugin_name,
             'wooss_ajax_object',
+            [
                 'wooss_ajax_url'      => admin_url('admin-ajax.php'),
                 'wooss_ajax_security' => wp_create_nonce('wooss-ajax-security-nonce'),
+            ]
+            array(
+                'wooss_ajax_url'      => admin_url( 'admin-ajax.php' ),
+                'wooss_ajax_security' => wp_create_nonce( 'wooss-ajax-security-nonce' ),
+            )
         );
         wp_enqueue_script('wooss_shipping_method_serilizejson_script', plugin_dir_url(__FILE__) . '../includes/assets/js/jqueryserilize.js', array('jquery'), $this->version, false);
         wp_enqueue_script('wooss_shipping_method_js_script', plugin_dir_url(__FILE__) . '../includes/assets/js/script.js', array('jquery','wooss_shipping_method_serilizejson_script'), $this->version, false);
+        wp_enqueue_script( 'wooss_shipping_method_serilizejson_script', plugin_dir_url( __FILE__ ) . '../includes/assets/js/jqueryserilize.js', array( 'jquery' ), $this->version, false );
+        wp_enqueue_script( 'wooss_shipping_method_js_script', plugin_dir_url( __FILE__ ) . '../includes/assets/js/script.js', array( 'jquery', 'wooss_shipping_method_serilizejson_script' ), $this->version, false );
         wp_localize_script(
             'wooss_shipping_method_js_script',
             'wooss_ajax_object',
+            [
                 'wooss_ajax_url'      => admin_url('admin-ajax.php'),
                 'wooss_ajax_security' => wp_create_nonce('wooss-ajax-security-nonce'),
+            ]
+            array(
+                'wooss_ajax_url'      => admin_url( 'admin-ajax.php' ),
+                'wooss_ajax_security' => wp_create_nonce( 'wooss-ajax-security-nonce' ),
+            )
         );
+    }
 …
      * Function to check if woo-commerce is installed.
      */
+    public function check_wc()
+    {
+        if (!in_array('woocommerce/woocommerce.php', apply_filters('active_plugins', get_option('active_plugins')))) {
+    public function check_wc() {
+        if ( ! in_array( 'woocommerce/woocommerce.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) ) {
             ?>
             <div class=" notice notice-error">
                 <p>
                     <?php
                     esc_html_e('Sendbox Shipping require WooCommerce for working. ', 'wooss');
+                    esc_html_e( 'Sendbox Shipping require WooCommerce for working. ', 'wooss' );
                     ?>
                 </p>
             </div>
         <?php
+            <?php
+        }
 …
      * @return array
      */
     public function add_sendbox_metabox()
+    {
          if (!isset($_GET['post']))
                 return;
          global $post_type;
         if (is_admin() && "shop_order" == $post_type) {
             $order_id = $_GET['post'];
             $_order = wc_get_order($order_id);
             $method_id = "";
             foreach ($_order->get_items('shipping') as $item_id => $shipping_item_obj) {
+    //phpcs:disable
+    public function add_sendbox_metabox() {
+        if ( ! isset( $_GET['post'] ) ) {
+              return;
+        }
+        global $post_type;
+        if ( is_admin() && 'shop_order' == $post_type ) {
+            $order_id  = $_GET['post'];
+            $_order    = wc_get_order( $order_id );
+            $method_id = '';
+            foreach ( $_order->get_items( 'shipping' ) as $item_id => $shipping_item_obj ) {
                 $method_id .= $shipping_item_obj->get_method_id();
+            }
+            if ($method_id == "wooss") {
+                add_meta_box('wooss_ship_sendbox', __('Ship with Sendbox', 'wooss'), array($this, 'field_for_request_shipments'), 'shop_order', 'side', 'high');
+            }
+        }
+    }
+    public function field_for_request_shipments($order)
+    {
+            if ( $method_id == 'wooss' ) {
+                add_meta_box( 'wooss_ship_sendbox', __( 'Ship with Sendbox', 'wooss' ), array( $this, 'field_for_request_shipments' ), 'shop_order', 'side', 'high' );
+            }
+        }
+    }
+    public function field_for_request_shipments( $order ) {
         global $post_type;
         $order_id = $order->ID;
+        if ('shop_order' == $post_type) {
+            $_order              = new WC_Order($order_id);
+        $shipping_methods_enabled = get_option( 'wooss_option_enable' );
+        if ( 'shop_order' == $post_type && $shipping_methods_enabled != "no" ) {
+            $_order              = new WC_Order( $order_id );
             $destination_name    = $_order->get_formatted_billing_full_name();
             $destination_phone   = $_order->get_billing_phone();
 …
             $countries_obj = new WC_Countries();
             $states = $countries_obj->get_states($destination_country);
             foreach ($states as $state_code => $state_name) {
                 if ($destination_state == $state_code) {
+            $states = $countries_obj->get_states( $destination_country );
+            foreach ( $states as $state_code => $state_name ) {
+                if ( $destination_state == $state_code ) {
                     $destination_state = $state_name;
                     break;
+                }
+            }
             if(empty($destination_state)){
                 $destination_state = "London";
+            }
         $country = $countries_obj->get_countries();
             foreach ($country as $country_code => $country_name) {
                 if ($destination_country == $country_code) {
+            }
+            if ( empty( $destination_state ) ) {
+                $destination_state = 'London';
+            }
+            $country = $countries_obj->get_countries();
+            foreach ( $country as $country_code => $country_name ) {
+                if ( $destination_country == $country_code ) {
                     $destination_country = $country_code;
                     break;
+                }
+            }
             $customer_products = $_order->get_items();
             $items_lists       = [];
+            $items_lists       = array();
             $fee      = 0;
             $quantity = 0;
             foreach ($customer_products as $products_data) {
+            foreach ( $customer_products as $products_data ) {
                 $product_data                  = $products_data->get_data();
                 $product_id                    = $product_data['product_id'];
                 $_product                      = wc_get_product($product_id);
+                $_product                      = wc_get_product( $product_id );
                 $items_data                    = new stdClass();
                 $items_data->name              = $product_data['name'];
 …
                 $items_data->amount_to_receive = $_product->get_price();
                 $items_data->package_size_code = 'medium';
                 $items_data->item_type_code    = strip_tags(wc_get_product_category_list($product_id));
+                $items_data->item_type_code    = strip_tags( wc_get_product_category_list( $product_id ) );
                 $product_weight = $_product->get_weight();
                 if (null != $product_weight) {
+                if ( null != $product_weight ) {
                     $weight = $product_weight;
                 } else {
                     $weight = 0;
+                }
                 $fee               += round($_product->get_price());
+                $fee               += round( $_product->get_price() );
                 $quantity          += $product_data['quantity'];
                 $items_data->weight = $weight * $quantity;
                 array_push($items_lists, $items_data);
+            }
             $api_call                   = new Wooss_Sendbox_Shipping_API();
             //$auth_header                = get_option('wooss_basic_auth');
             $auth_header = Wooss_Sendbox_Shipping_API::checkAuth();
+                array_push( $items_lists, $items_data );
+            }
+            $api_call = new Wooss_Sendbox_Shipping_API();
+            $auth_header                = Wooss_Sendbox_Shipping_API::checkAuth();
+            $sendbox_data               = get_option('sendbox_data');
             $args                       = array(
+                'timeout' => 30,
                 'headers' => array(
                     'Content-Type'  => 'application/json',
 …
             );
             $profile_api_url            = 'https://live.sendbox.co/oauth/profile';
             $profile_data_response_code = $api_call->get_api_response_code($profile_api_url, $args, 'GET');
             $profile_data_response_body = $api_call->get_api_response_body($profile_api_url, $args, 'GET');
+            $profile_data_response_code = $api_call->get_api_response_code( $profile_api_url, $args, 'GET' );
+            $profile_data_response_body = $api_call->get_api_response_body( $profile_api_url, $args, 'GET' );
             $wooss_origin_name          = '';
             $wooss_origin_email         = '';
             $wooss_origin_phone         = '';
             if (200 == $profile_data_response_code) {
+            if ( 200 == $profile_data_response_code ) {
                 $wooss_origin_name  = $profile_data_response_body->name;
                 $wooss_origin_email = $profile_data_response_body->email;
                 $wooss_origin_phone = $profile_data_response_body->phone;
+            }
             $wc_city             = get_option('woocommerce_store_city');
             $wc_store_address    = get_option('woocommerce_store_address');
             $wooss_origin_city   = get_option('sendbox_data')['wooss_city'];
             $wooss_origin_street = get_option('sendbox_data')['wooss_street'];
             if (null == $wooss_origin_city) {
+            $wc_city             = get_option( 'woocommerce_store_city' );
+            $wc_store_address    = get_option( 'woocommerce_store_address' );
+            $wooss_origin_city   = $sendbox_data['wooss_city'];
+            $wooss_origin_street = $sendbox_data['wooss_street'];
+            if ( ! $wooss_origin_city ) {
                 $wooss_origin_city = $wc_city;
+            }
             if (null == $wooss_origin_street) {
+            if ( ! $wooss_origin_street ) {
                 $wooss_origin_street = $wc_store_address;
+            }
             $wooss_origin_states_selected = get_option('sendbox_data')['wooss_state_dropdown'];
             if (null == $wooss_origin_states_selected) {
+            $wooss_origin_states_selected = $sendbox_data['wooss_state_name'];
+            if ( ! $wooss_origin_states_selected ) {
                 $wooss_origin_states_selected = '';
+            }
             $wooss_origin_country = get_option('wooss_origin_country');
             if (null == $wooss_origin_country) {
+            $wooss_origin_country = $sendbox_data[ 'wooss_origin_country' ];
+            if ( ! $wooss_origin_country ) {
                 $wooss_origin_country = 'Nigeria';
+            }
             $wooss_pickup_type = get_option('sendbox_data')['wooss_pickup_type'];
             if (null == $wooss_pickup_type) {
+            $wooss_pickup_type = $sendbox_data['wooss_pickup_type'];
+            if ( ! $wooss_pickup_type ) {
                 $wooss_pickup_type = 'pickup';
+            }
             $incoming_option_code = get_option('sendbox_data')['wooss_pickup_type'];
             if (null == $incoming_option_code) {
+            $incoming_option_code = $sendbox_data['wooss_pickup_type'];
+            if ( ! $incoming_option_code ) {
                 return;
+            }
             $date = new DateTime();
+            $date->modify('+1 day');
+            $method_id = "";
+            $pickup_date = $date->format(DateTime::ATOM);
+            $method_id = "";
+            foreach ($_order->get_items('shipping') as $item_id => $shipping_item_obj) {
+            $date->modify( '+1 day' );
+            $method_id   = '';
+            $pickup_date = $date->format( DateTime::ATOM );
+            $method_id = '';
+            foreach ( $_order->get_items( 'shipping' ) as $item_id => $shipping_item_obj ) {
                 $method_id .= $shipping_item_obj->get_method_id();
+            }
             if ($method_id == "wooss") {
+            if ( $method_id == 'wooss' ) {
                 ?>
 …
                 <div  id="wooss_shipments_data">
                     <span style="display:none;"><strong><?php esc_html_e('Origin Details : ', 'wooss'); ?></strong>
+                    <span style="display:none;"><strong><?php esc_html_e( 'Origin Details : ', 'wooss' ); ?></strong>
                         <i>This represents your store details</i>
                         <br />
                         <strong><label for="wooss_origin_name"><?php esc_html_e('Name : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_origin_name" id="wooss_origin_name" class="wooss-text" value="<?php echo (esc_attr($wooss_origin_name)); ?>" readonly>
+                        <strong><label for="wooss_origin_name"><?php esc_html_e( 'Name : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_origin_name" id="wooss_origin_name" class="wooss-text" value="<?php echo ( esc_attr( $wooss_origin_name ) ); ?>" readonly>
                         &nbsp
                         <strong><label for="wooss_origin_phone"><?php esc_html_e('Phone : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_origin_phone" id="wooss_origin_phone" class="wooss-text" value="<?php echo (esc_attr($wooss_origin_phone)); ?>" readonly>
+                        <strong><label for="wooss_origin_phone"><?php esc_html_e( 'Phone : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_origin_phone" id="wooss_origin_phone" class="wooss-text" value="<?php echo ( esc_attr( $wooss_origin_phone ) ); ?>" readonly>
                         <br />&nbsp
                         <br /><strong><label for="wooss_origin_email"><?php esc_html_e('Email : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_origin_email" id="wooss_origin_email" class="wooss-text" value="<?php echo (esc_attr($wooss_origin_email)); ?>" readonly>
+                        <br /><strong><label for="wooss_origin_email"><?php esc_html_e( 'Email : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_origin_email" id="wooss_origin_email" class="wooss-text" value="<?php echo ( esc_attr( $wooss_origin_email ) ); ?>" readonly>
                         &nbsp
                         <strong><label for="wooss_origin_street"><?php esc_html_e('Street : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_origin_street" id="wooss_origin_street" class="wooss-text" class="wooss-text" value="<?php echo (esc_attr($wc_store_address)); ?>" readonly>
+                        <strong><label for="wooss_origin_street"><?php esc_html_e( 'Street : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_origin_street" id="wooss_origin_street" class="wooss-text" class="wooss-text" value="<?php echo ( esc_attr( $wc_store_address ) ); ?>" readonly>
                         <br />&nbsp
                         <br /><strong><label for="wooss_origin_country"><?php esc_html_e('Country : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_origin_country" id="wooss_origin_country" class="wooss-text" value="<?php echo (esc_attr($wooss_origin_country)); ?>" readonly>
+                        <br /><strong><label for="wooss_origin_country"><?php esc_html_e( 'Country : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_origin_country" id="wooss_origin_country" class="wooss-text" value="<?php echo ( esc_attr( $wooss_origin_country ) ); ?>" readonly>
                         &nbsp
                         <strong><label for="wooss_origin_state"><?php esc_html_e('States : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_origin_state" id="wooss_origin_state" class="wooss-text" value="<?php echo (esc_attr($wooss_origin_states_selected)); ?>" readonly>
+                        <strong><label for="wooss_origin_state"><?php esc_html_e( 'States : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_origin_state" id="wooss_origin_state" class="wooss-text" value="<?php echo ( esc_attr( $wooss_origin_states_selected ) ); ?>" readonly>
                         &nbsp
 …
                         <br /><strong><label for="wooss_origin_city"><?php esc_html_e('City : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_origin_city" id="wooss_origin_city" class="wooss-text" value="<?php echo (esc_attr($wooss_origin_city)); ?>" readonly>
+                        <br /><strong><label for="wooss_origin_city"><?php esc_html_e( 'City : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_origin_city" id="wooss_origin_city" class="wooss-text" value="<?php echo ( esc_attr( $wooss_origin_city ) ); ?>" readonly>
                     </span>
 …
                     <br />
                     <br />
                     <span  style="display:none;"><strong><?php esc_html_e('Destination Details : ', 'wooss'); ?></strong>
+                    <span  style="display:none;"><strong><?php esc_html_e( 'Destination Details : ', 'wooss' ); ?></strong>
                         <i>This represents your customer details</i>
                         <br />
                         <strong><label for="wooss_destination_name"><?php esc_html_e('Name : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_destination_name" id="wooss_destination_name" class="wooss-text" value="<?php esc_html_e($destination_name); ?>" readonly>
+                        <strong><label for="wooss_destination_name"><?php esc_html_e( 'Name : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_destination_name" id="wooss_destination_name" class="wooss-text" value="<?php esc_html_e( $destination_name ); ?>" readonly>
                         &nbsp
                         <label><label for="wooss_destination_phone"><?php esc_html_e('Phone : ', 'wooss'); ?></label></label>
                         <input type="text" name="wooss_destination_phone" id="wooss_destination_phone" class="wooss-text" value="<?php esc_html_e($destination_phone); ?>" readonly>
+                        <label><label for="wooss_destination_phone"><?php esc_html_e( 'Phone : ', 'wooss' ); ?></label></label>
+                        <input type="text" name="wooss_destination_phone" id="wooss_destination_phone" class="wooss-text" value="<?php esc_html_e( $destination_phone ); ?>" readonly>
                         <br />&nbsp
                         <br /><strong><label for="wooss_destination_email"><?php esc_html_e('Email : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_destination_email" id="wooss_destination_email" class="wooss-text" value="<?php esc_html_e($destination_email); ?>" readonly>
+                        <br /><strong><label for="wooss_destination_email"><?php esc_html_e( 'Email : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_destination_email" id="wooss_destination_email" class="wooss-text" value="<?php esc_html_e( $destination_email ); ?>" readonly>
                         &nbsp
                         <strong><label for="wooss_destination_street"><?php esc_html_e('Street : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_destination_street" id="wooss_destination_street" class="wooss-text" value="<?php esc_html_e($destination_street); ?>" readonly>
+                        <strong><label for="wooss_destination_street"><?php esc_html_e( 'Street : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_destination_street" id="wooss_destination_street" class="wooss-text" value="<?php esc_html_e( $destination_street ); ?>" readonly>
                         <br />&nbsp
                         <br /><strong><label for="wooss_destination_country"><?php esc_html_e('Country : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_destination_country" id="wooss_destination_country" class="wooss-text" value="<?php esc_html_e($destination_country); ?>" readonly>
+                        <br /><strong><label for="wooss_destination_country"><?php esc_html_e( 'Country : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_destination_country" id="wooss_destination_country" class="wooss-text" value="<?php esc_html_e( $destination_country ); ?>" readonly>
                         &nbsp
                         <strong><label for="wooss_destination_state"><?php esc_html_e('State : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_destination_state" id="wooss_destination_state" class="wooss-text" value="<?php esc_html_e($destination_state); ?>" readonly>
+                        <strong><label for="wooss_destination_state"><?php esc_html_e( 'State : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_destination_state" id="wooss_destination_state" class="wooss-text" value="<?php esc_html_e( $destination_state ); ?>" readonly>
                         <br />&nbsp
                          <br /><strong><label for="wooss_destination_city"><?php esc_html_e('City : ', 'wooss'); ?></label></strong>
                         <input type="text" name="wooss_destination_city" id="wooss_destination_city" class="wooss-text" value="<?php esc_html_e($destination_city); ?>" readonly>
                 </span>
+                         <br /><strong><label for="wooss_destination_city"><?php esc_html_e( 'City : ', 'wooss' ); ?></label></strong>
+                        <input type="text" name="wooss_destination_city" id="wooss_destination_city" class="wooss-text" value="<?php esc_html_e( $destination_city ); ?>" readonly>
+                 </span>
                     <?php
                     $product_content = '';
                     foreach ($items_lists as $lists_id => $list_data) {
+                    foreach ( $items_lists as $lists_id => $list_data ) {
                         $product_name              = $list_data->name;
                         $product_quantity          = $list_data->quantity;
 …
                     // loading the payload
                     $payload_data                         = new stdClass();
                     $payload_data->origin_name      = $wooss_origin_name;
                     //$payload_data->destination_country    = $destination_country;
+                    $payload_data              = new stdClass();
+                    $payload_data->origin_name = $wooss_origin_name;
+                    // $payload_data->destination_country    = $destination_country;
                     $payload_data->destination_country_code = $destination_country;
+                    //$payload_data->destination_state_code = ' ';
+                    $payload_data->destination_state      = $destination_state;
+                    $payload_data->destination_city       = $destination_city;
+                    $payload_data->destination_street     = $destination_street;
+                    $payload_data->destination_name       = $destination_name;
+                    $payload_data->destination_phone      = $destination_phone;
+                    $payload_data->items                  = $items_lists;
+                    $payload_data->weight                 = (int) $weight * $quantity;
+                    $payload_data->amount_to_receive      = (int) $fee;
+                    $payload_data->origin_country         = $wooss_origin_country;
+                    $payload_data->origin_state           = $wooss_origin_states_selected;
+                    $payload_data->origin_phone    = $wooss_origin_phone;
+                    $payload_data->origin_street         = $wc_store_address;
+                    $payload_data->origin_city     = $wooss_origin_city;
+                    //$payload_data->deliver_priority_code = 'next_day';
+                    $payload_data->pickup_date           = $pickup_date;
+                    $payload_data->incoming_option_code  = $incoming_option_code;
+                    $payload_data->payment_option_code   = 'prepaid';
+                    //$payload_data->deliver_type_code     = 'last_mile';
+                    $payload_data_json = wp_json_encode($payload_data);
+                    // $payload_data->destination_state_code = ' ';
+                    $payload_data->destination_state  = $destination_state;
+                    $payload_data->destination_city   = $destination_city;
+                    $payload_data->destination_street = $destination_street;
+                    $payload_data->destination_name   = $destination_name;
+                    $payload_data->destination_phone  = $destination_phone;
+                    $payload_data->items              = $items_lists;
+                    $payload_data->weight             = (int) $weight * $quantity;
+                    $payload_data->amount_to_receive  = (int) $fee;
+                    $payload_data->origin_country     = $wooss_origin_country;
+                    $payload_data->origin_state       = $wooss_origin_states_selected;
+                    $payload_data->origin_phone  = $wooss_origin_phone;
+                    $payload_data->origin_street = $wc_store_address;
+                    $payload_data->origin_city   = $wooss_origin_city;
+                    // $payload_data->deliver_priority_code = 'next_day';
+                    $payload_data->pickup_date          = $pickup_date;
+                    $payload_data->incoming_option_code = $incoming_option_code;
+                    $payload_data->payment_option_code  = 'prepaid';
+                    // $payload_data->deliver_type_code     = 'last_mile';
+                    $payload_data_json = wp_json_encode( $payload_data );
                     $delivery_args     = array(
+                        'timeout' => 30,
                         'headers' => array(
                             'Content-Type'  => 'application/json',
                             'Authorization' => $auth_header,
                         ),
+                        'body'    => $payload_data_json,
+                    );
+                    //print_r($payload_data_json);
+                        'body'    => $payload_data_json,
+                    );
+                    // print_r($payload_data_json);
                     ?>
                 </div>
 …
                     <span>
                         <!--<label?php _e('Items : ', 'wooss'); ?></label> --->
                         <textarea style="display:none;" cols="50" class="wooss-textarea" id="wooss_items_list" value="<?php esc_html_e($product_content); ?>" data-id="<?php echo esc_attr($order_id); ?>"><?php trim(esc_html_e($product_content)); ?></textarea>
+                        <textarea style="display:none;" cols="50" class="wooss-textarea" id="wooss_items_list" value="<?php esc_html_e( $product_content ); ?>" data-id="<?php echo esc_attr( $order_id ); ?>"><?php trim( esc_html_e( $product_content ) ); ?></textarea>
                         <?php
                         $quote_api_url =  $api_call->get_sendbox_api_url('delivery_quote');
                         $quote_body    = $api_call->get_api_response_body($quote_api_url, $delivery_args, 'POST');
                        // var_dump($quote_body);
+                        $quote_api_url = $api_call->get_sendbox_api_url( 'delivery_quote' );
+                        $quote_body    = $api_call->get_api_response_body( $quote_api_url, $delivery_args, 'POST' );
+                        // var_dump($quote_body);
                         $quotes_rates = $quote_body->rates;
+                        //print_r($quote_body);
+                        // print_r($quote_body);
                         $wallet = $quote_body->wallet_balance;
                         foreach ($quotes_rates as $rates_id => $rates_values) {
+                        foreach ( $quotes_rates as $rates_id => $rates_values ) {
                             $rates_names = $rates_values->name;
                             $rates_fee   = $rates_values->fee;
                             $rates_id   = $rates_values->id;
                             //print_r($rates_values);
+                            $rates_id    = $rates_values->id;
+                            // print_r($rates_values);
+                        }
 …
                                 <b>
                                     <?php
                                     esc_attr_e("WALLET BALANCE");
+                                    esc_attr_e( 'WALLET BALANCE' );
                                     ?>
                                 </b>
 …
                                 <b>
                                     <?php
                                     esc_attr_e("₦" . $wallet);
+                                    esc_attr_e( '₦' . $wallet );
                                     ?>
                                 </b>
                             </div>
                         <select id="wooss_selected_courier" >
                                 <option value=""> <?php esc_attr_e("Select a courier... "); ?> </option>
+                                <option value=""> <?php esc_attr_e( 'Select a courier... ' ); ?> </option>
                                 <?php
                                 foreach ($quotes_rates as $rates_id => $rates_values) {
+                                foreach ( $quotes_rates as $rates_id => $rates_values ) {
                                     $rates_names = $rates_values->name;
                                     $rates_fee   = $rates_values->fee;
                                     $rates_id   = $rates_values->courier_id;
+                                    $rates_id    = $rates_values->courier_id;
                                     ?>
                                     <option data-courier-price="<?php esc_attr_e($rates_fee, 'wooss'); ?> " value="<?php esc_attr_e($rates_id, 'wooss'); ?>" id="<?php _e($rates_id, 'wooss'); ?>"><?php esc_attr_e($rates_names) ?></option>
                                 <?php
+                                    <option data-courier-price="<?php esc_attr_e( $rates_fee, 'wooss' ); ?> " value="<?php esc_attr_e( $rates_id, 'wooss' ); ?>" id="<?php _e( $rates_id, 'wooss' ); ?>"><?php esc_attr_e( $rates_names ); ?></option>
+                                    <?php
+                                }
                                 ?>
 …
                             <?php
+                            // for the countries
+                            unset( $args['headers']['Authorization'] );
+                            $countries_api_url = add_query_arg( 'page_by', '{"per_page":264}', 'https://api.sendbox.co/auth/countries' );
+                            $countries_data_obj = wp_remote_get( $countries_api_url, $args );
+                            // https://api.sendbox.co/auth/states?page_by={"per_page":10000}&country_code=NG
+                            $countries_body = json_decode( wp_remote_retrieve_body( $countries_data_obj ) );
+                            ?>
+                            <select  id = "wooss_destination_country">
+                                <option data-country-code="default" value="">
+                                <?php _e( 'Please select destination country' ); ?>
+                                </option>
+                                <?php
+                                foreach ( $countries_body as $key => $value ) {
+                                    if ( is_array( $value ) ) {
+                                        sort( $value );
+                                        foreach ( $value as $ship_key => $ship_value ) {
+                                              echo "<option data-country-code='" . $ship_value->code . "' value='" . $ship_value->name . "'>" . $ship_value->name . ' </option>';
+                                        }
+                                    }
+                                }
+                                ?>
+                        </select>
                         //for the countries
+                        <?php // end of countries ?>
+                        unset($args['headers']['Authorization']);
+                        $countries_api_url = add_query_arg( 'page_by', '{"per_page":264}', 'https://api.sendbox.co/auth/countries' );
+                        <?php
+                        $country_code_default = 'NG';
+                        $states_api_url  = add_query_arg(
+                            array(
+                                'page_by'   => '{"per_page":10000}',
+                                'filter_by' => '{"country_code":"' . $country_code_default . '"}',
+                            ),
+                            'https://api.sendbox.co/auth/states'
+                        );
+                        $states_data_obj = wp_remote_get( $states_api_url, $args );
+                           $states_body = json_decode( wp_remote_retrieve_body( $states_data_obj ) );
+                        ?>
+                        $countries_data_obj =   wp_remote_get($countries_api_url, $args);
+//  https://api.sendbox.co/auth/states?page_by={"per_page":10000}&country_code=NG
+                        $countries_body    = json_decode(wp_remote_retrieve_body($countries_data_obj));
+                        ?>
+                            <select  id = "wooss_destination_country">
+                                <option data-country-code="default" value="">
+                                <?php _e('Please select destination country'); ?>
+                                </option>
+                                <?php
+                        foreach($countries_body as $key => $value){
+                          if (is_array($value)){
+                              sort($value);
+                              foreach($value as $ship_key => $ship_value){
+                                echo "<option data-country-code='".$ship_value->code."' value='".$ship_value->name."'>".$ship_value->name." </option>";
+                              }
+                          }
+                        }
+                        ?>
+                        </select>
+                        <?//end of countries?>
+                        <?php
+                        $country_code_default = "NG";
+                        $states_api_url = add_query_arg( array( 'page_by'=> '{"per_page":10000}' , 'filter_by' => '{"country_code":"'.$country_code_default.'"}'), 'https://api.sendbox.co/auth/states' );
+                        $states_data_obj =  wp_remote_get($states_api_url, $args);
+                           $states_body    = json_decode(wp_remote_retrieve_body($states_data_obj));
+                        ?>
+                            <select id = "wooss_destination_state" >
+                            <select id = "wooss_destination_state" >
                                <option data-state-code="default" value = "">
+                                <?php _e('Please select destination state'); ?>
+                                </option>
+                                <?php
+                        foreach($states_body as $states_key => $states_values){
+                          if (is_array($states_values)){
+                              sort($states_values);
+                              foreach($states_values as $ship_state_key => $ship_state_value){
+                                if (!empty($ship_state_value)){
+                                   echo "<option data-states-code='".$ship_value->code."' value=".$ship_state_value->name.">".$ship_state_value->name." </option>";
+                               }
+                          }
+                        }  }
+                            ?>
+                                <?php _e( 'Please select destination state' ); ?>
+                                </option>
+                                <?php
+                                foreach ( $states_body as $states_key => $states_values ) {
+                                    if ( is_array( $states_values ) ) {
+                                        sort( $states_values );
+                                        foreach ( $states_values as $ship_state_key => $ship_state_value ) {
+                                            if ( ! empty( $ship_state_value ) ) {
+                                                echo "<option data-states-code='" . $ship_value->code . "' value=" . $ship_state_value->name . '>' . $ship_state_value->name . ' </option>';
+                                            }
+                                        }
+                                    }
+                                }
+                                ?>
                             </select>
+    <?php
+                            $country_code_default = "NG";
+                            if (get_option('wooss_selected_country_code_used')){
+                                $country_code_default = get_option('wooss_selected_country_code_used');
+                            }
+                        $city_api_url = add_query_arg( array( 'page_by'=> '{"per_page":10000}' , 'filter_by' => '{"country_code":"'.$country_code_default.'"}'), 'https://api.sendbox.co/auth/cities' );
+                        $city_data_obj =    wp_remote_get($city_api_url, $args);
+                           $city_body    = json_decode(wp_remote_retrieve_body($city_data_obj));
+    ?>
+                    <input id= "wooss_destination_city_name" type="text" placeholder="Enter Destination City"  value="<?php esc_html_e($destination_city); ?>">
+                <?php
+                            $country_code_default = 'NG';
+                if ( $sendbox_data[ 'wooss_selected_country_code_used' ] ) {
+                    $country_code_default = $sendbox_data[ 'wooss_selected_country_code_used' ];
+                }
+                        $city_api_url  = add_query_arg(
+                            array(
+                                'page_by'   => '{"per_page":10000}',
+                                'filter_by' => '{"country_code":"' . $country_code_default . '"}',
+                            ),
+                            'https://api.sendbox.co/auth/cities'
+                        );
+                        $city_data_obj = wp_remote_get( $city_api_url, $args );
+                           $city_body = json_decode( wp_remote_retrieve_body( $city_data_obj ) );
+                ?>
+                    <input id= "wooss_destination_city_name" type="text" placeholder="Enter Destination City"  value="<?php esc_html_e( $destination_city ); ?>">
                             <?php
+                                  $postal_code = $_order->get_billing_postcode();
+                            if (!empty($postal_code)){
+                                echo "<input id= 'wooss_postal_code' type='text' value='".$postal_code."' placeholder='Enter Postal Code'>";
+                                  $postal_code = $_order->get_billing_postcode();
+                            if ( ! empty( $postal_code ) ) {
+                                echo "<input id= 'wooss_postal_code' type='text' value='" . $postal_code . "' placeholder='Enter Postal Code'>";
+                            }
                             ?>
 …
                                 <b id="dabs">
                                     <?php
                                     esc_attr_e("Fee: 0.0");
+                                    esc_attr_e( 'Fee: 0.0' );
                                     ?>
                                 </b>
                                 <button id="wooss_request_shipment" class="button-primary"><?php esc_html_e('Request Shipment'); ?></button>
+                                <button id="wooss_request_shipment" class="button-primary"><?php esc_html_e( 'Request Shipment' ); ?></button>
                             </div>
                         </span>
                     </span>
                 <?php
+                }
+            }
+        }
+            }
+        }
+    }
         /**
 …
          * @return void
          */
+        public function request_shipments()
+        {
+            if (isset($_POST['data'])) {
+                $data              = wp_unslash($_POST['data']);
+                $order_id          = sanitize_text_field($data['wooss_order_id']);
+                $_order            = new WC_Order($order_id);
+                $customer_products = $_order->get_items();
+                $items_lists       = [];
+                $fee      = 0;
+                $quantity = 0;
+                foreach ($customer_products as $products_data) {
+                    $product_data                  = $products_data->get_data();
+                    $product_id                    = $product_data['product_id'];
+                    $_product                      = wc_get_product($product_id);
+                    $items_data                    = new stdClass();
+                    $items_data->name              = $product_data['name'];
+                    $items_data->quantity          = $product_data['quantity'];
+                    $items_data->value             = $_product->get_price();
+                    $items_data->amount_to_receive = $_product->get_price();
+                    $items_data->package_size_code = 'medium';
+                    $items_data->item_type_code    = strip_tags(wc_get_product_category_list($product_id));
+                    $product_weight = $_product->get_weight();
+                    if (null != $product_weight) {
+                        $weight = $product_weight;
+                    } else {
+                        $weight = 0;
+                    }
+                    $fee               += round($_product->get_price());
+                    $quantity          += $product_data['quantity'];
+                    $items_data->weight = $weight * $quantity;
+                    array_push($items_lists, $items_data);
+    public function request_shipments() {
+        if ( isset( $_POST['data'] ) ) {
+            $data              = wp_unslash( $_POST['data'] );
+            $order_id          = sanitize_text_field( $data['wooss_order_id'] );
+            $_order            = new WC_Order( $order_id );
+            $customer_products = $_order->get_items();
+            $items_lists       = array();
+            $fee      = 0;
+            $quantity = 0;
+            foreach ( $customer_products as $products_data ) {
+                $product_data                  = $products_data->get_data();
+                $product_id                    = $product_data['product_id'];
+                $_product                      = wc_get_product( $product_id );
+                $items_data                    = new stdClass();
+                $items_data->name              = $product_data['name'];
+                $items_data->quantity          = $product_data['quantity'];
+                $items_data->value             = $_product->get_price();
+                $items_data->amount_to_receive = $_product->get_price();
+                $items_data->package_size_code = 'medium';
+                $items_data->item_type_code    = strip_tags( wc_get_product_category_list( $product_id ) );
+                $product_weight = $_product->get_weight();
+                if ( null != $product_weight ) {
+                    $weight = $product_weight;
+                } else {
+                    $weight = 0;
+                }
+                $courier_selected = sanitize_text_field($data['wooss_selected_courier']);
+                $destination_name    = sanitize_text_field($data['wooss_destination_name']);
+                $destination_phone   = sanitize_text_field($data['wooss_destination_phone']);
+                $destination_email   = sanitize_text_field($data['wooss_destination_email']);
+                $destination_city    = sanitize_text_field($data['wooss_destination_city']);
+                $destination_country = sanitize_text_field($data['wooss_destination_country']);
+                $destination_state   = sanitize_text_field($data['wooss_destination_state']);
+                $destination_street  = sanitize_text_field($data['wooss_destination_street']);
+                $origin_name    = sanitize_text_field($data['wooss_origin_name']);
+                $origin_phone   = sanitize_text_field($data['wooss_origin_phone']);
+                $origin_email   = sanitize_text_field($data['wooss_origin_email']);
+                $origin_city    = sanitize_text_field($data['wooss_origin_city']);
+                $origin_state   = sanitize_text_field($data['wooss_origin_state']);
+                $origin_street  = sanitize_text_field($data['wooss_origin_street']);
+                $origin_country = sanitize_text_field($data['wooss_origin_country']);
+                $destination_post_code = sanitize_text_field($data['wooss_postal_code']);
+                $webhook_url = get_site_url() . '/wp-json/wooss/v2/shipping';
+                $payload_data = new stdClass();
+                //$payload_data->selected_courier_id = $courier_selected;
+                $payload_data->destination_name    = $destination_name;
+                $payload_data->destination_phone   = $destination_phone;
+                $payload_data->destination_email   = $destination_email;
+                $payload_data->destination_city    = $destination_city;
+                $payload_data->destination_country = $destination_country;
+                $payload_data->destination_state   = $destination_state;
+                $payload_data->destination_street  = $destination_street;
+                $payload_data->weight = $product_weight;
+                $payload_data->origin_name       = $origin_name;
+                $payload_data->origin_phone      = $origin_phone;
+                $payload_data->origin_email      = $origin_email;
+                $payload_data->origin_city       = $origin_city;
+                $payload_data->origin_state      = $origin_state;
+                $payload_data->origin_street     = $origin_street;
+                $payload_data->origin_country    = $origin_country;
+                $payload_data->items             = $items_lists;
+                $payload_data->reference_code    = trim(str_replace('#', '', $order_id));
+                $payload_data->amount_to_receive = $_order->get_shipping_total();
+                $payload_data->delivery_callback = $webhook_url;
+                $payload_data->destination_post_code = $destination_post_code;
+                $date = new DateTime();
+                $date->modify('+1 day');
+                $pickup_date = $date->format('c');
+                $payload_data->deliver_priority_code = 'next_day';
+                $payload_data->pickup_date           = $pickup_date;
+                $payload_data->channel_code ='api';
+                $payload_data->rate_code ="standard" ;
+                $api_call    = new Wooss_Sendbox_Shipping_API();
+                //$auth_header = get_option('wooss_basic_auth');
+                $auth_header = Wooss_Sendbox_Shipping_API::checkAuth();;
+                $payload_data_json = wp_json_encode($payload_data);
+                $shipments_args = array(
+                    'headers' => array(
+                        'Content-Type'  => 'application/json',
+                        'Authorization' => $auth_header,
+                    ),
+                    'body'    => $payload_data_json,
+                );
+                //var_dump($shipments_args);
+                $shipments_url = $api_call->get_sendbox_api_url('shipments');
+                $shipments_details = $api_call->get_api_response_body($shipments_url, $shipments_args, 'POST');
+                //var_dump($shipments_details);
+                if (isset($shipments_details)) {
+                    $tracking_code = $shipments_details->code;
+                    $status_codes =  $shipments_details->status_code;
+                    $successfull       = 0;
+                    if ('pending' ==    $status_codes) {
+                        update_post_meta($order_id, 'wooss_tracking_code', 'Your tracking code for this order is : ' . $tracking_code);
+                        $successfull = 1;
+                    } elseif ('drafted' ==  $status_codes) {
+                        $successfull = 2;
+                    } else {
+                        $successfull = 3;
+                    }
+                $fee               += round( $_product->get_price() );
+                $quantity          += $product_data['quantity'];
+                $items_data->weight = $weight * $quantity;
+                array_push( $items_lists, $items_data );
+            }
+            $courier_selected = sanitize_text_field( $data['wooss_selected_courier'] );
+            $destination_name    = sanitize_text_field( $data['wooss_destination_name'] );
+            $destination_phone   = sanitize_text_field( $data['wooss_destination_phone'] );
+            $destination_email   = sanitize_text_field( $data['wooss_destination_email'] );
+            $destination_city    = sanitize_text_field( $data['wooss_destination_city'] );
+            $destination_country = sanitize_text_field( $data['wooss_destination_country'] );
+            $destination_state   = sanitize_text_field( $data['wooss_destination_state'] );
+            $destination_street  = sanitize_text_field( $data['wooss_destination_street'] );
+            $origin_name    = sanitize_text_field( $data['wooss_origin_name'] );
+            $origin_phone   = sanitize_text_field( $data['wooss_origin_phone'] );
+            $origin_email   = sanitize_text_field( $data['wooss_origin_email'] );
+            $origin_city    = sanitize_text_field( $data['wooss_origin_city'] );
+            $origin_state   = sanitize_text_field( $data['wooss_origin_state'] );
+            $origin_street  = sanitize_text_field( $data['wooss_origin_street'] );
+            $origin_country = sanitize_text_field( $data['wooss_origin_country'] );
+            $destination_post_code = sanitize_text_field( $data['wooss_postal_code'] );
+            $webhook_url = get_site_url() . '/wp-json/wooss/v2/shipping';
+            $payload_data = new stdClass();
+            // $payload_data->selected_courier_id = $courier_selected;
+            $payload_data->destination_name      = $destination_name;
+            $payload_data->destination_phone     = $destination_phone;
+            $payload_data->destination_email     = $destination_email;
+            $payload_data->destination_city      = $destination_city;
+            $payload_data->destination_country   = $destination_country;
+            $payload_data->destination_state     = $destination_state;
+            $payload_data->destination_street    = $destination_street;
+            $payload_data->weight                = $product_weight;
+            $payload_data->origin_name           = $origin_name;
+            $payload_data->origin_phone          = $origin_phone;
+            $payload_data->origin_email          = $origin_email;
+            $payload_data->origin_city           = $origin_city;
+            $payload_data->origin_state          = $origin_state;
+            $payload_data->origin_street         = $origin_street;
+            $payload_data->origin_country        = $origin_country;
+            $payload_data->items                 = $items_lists;
+            $payload_data->reference_code        = trim( str_replace( '#', '', $order_id ) );
+            $payload_data->amount_to_receive     = $_order->get_shipping_total();
+            $payload_data->delivery_callback     = $webhook_url;
+            $payload_data->destination_post_code = $destination_post_code;
+            $date = new DateTime();
+            $date->modify( '+1 day' );
+            $pickup_date = $date->format( 'c' );
+            $payload_data->deliver_priority_code = 'next_day';
+            $payload_data->pickup_date           = $pickup_date;
+            $payload_data->channel_code          = 'api';
+            $payload_data->rate_code             = 'standard';
+            $api_call = new Wooss_Sendbox_Shipping_API();
+            // $auth_header = get_option('wooss_basic_auth');
+            $auth_header = Wooss_Sendbox_Shipping_API::checkAuth();
+            $payload_data_json = wp_json_encode( $payload_data );
+            $shipments_args = array(
+                'timeout' => 30,
+                'headers' => array(
+                    'Content-Type'  => 'application/json',
+                    'Authorization' => $auth_header,
+                ),
+                'body'    => $payload_data_json,
+            );
+            // var_dump($shipments_args);
+            $shipments_url = $api_call->get_sendbox_api_url( 'shipments' );
+            $shipments_details = $api_call->get_api_response_body( $shipments_url, $shipments_args, 'POST' );
+            // var_dump($shipments_details);
+            if ( isset( $shipments_details ) ) {
+                $tracking_code = $shipments_details->code;
+                $status_codes  = $shipments_details->status_code;
+                $successfull   = 0;
+                if ( 'pending' == $status_codes ) {
+                    update_post_meta( $order_id, 'wooss_tracking_code', 'Your tracking code for this order is : ' . $tracking_code );
+                    $successfull = 1;
+                } elseif ( 'drafted' == $status_codes ) {
+                    $successfull = 2;
+                } else {
+                    $successfull = 3;
+                }
+                echo esc_attr($successfull);
+            }
+            wp_die();
+        }
+            }
+            echo esc_attr( $successfull );
+        }
+        wp_die();
+    }
         /**
 …
          * post data back to sendbox-shipping plugin.
          */
+        public function register_routes()
+        {
+            register_rest_route(
+                'wooss/v2',
+                '/shipping',
+                array(
+                    'methods'  => 'POST',
+                    'callback' => array($this, 'post_data'),
+                )
+            );
+        }
+    public function register_routes() {
+        register_rest_route(
+            'wooss/v2',
+            '/shipping',
+            array(
+                'methods'  => 'POST',
+                'callback' => array( $this, 'post_data' ),
+            )
+        );
+    }
         /**
          * This function updates order status after a post has been made to the webhook url.
+         *
          * @param    int $order_id Order ID.
+         * @param    int    $order_id Order ID.
          * @param    string $status_code Status Code.
+         *
          * @return object
          */
+        public function update_shipment_status($order_id, $status_code)
+        {
+            $order = wc_get_order($order_id);
+            if (null === $status_code) {
+                $order->update_status('on-hold');
+            }
+            if ('accepted' === $status_code) {
+                $order->update_status('processing');
+            }
+            if ('delivered' === $status_code) {
+                $order->update_status('completed');
+            }
+            if ('rejected' === $status_code) {
+                $order->update_status('failed');
+            }
+            if ('cancelled' === $status_code) {
+                $order->update_status('cancelled');
+            }
+            return $order;
+        }
+    public function update_shipment_status( $order_id, $status_code ) {
+        $order = wc_get_order( $order_id );
+        if ( null === $status_code ) {
+            $order->update_status( 'on-hold' );
+        }
+        if ( 'accepted' === $status_code ) {
+            $order->update_status( 'processing' );
+        }
+        if ( 'delivered' === $status_code ) {
+            $order->update_status( 'completed' );
+        }
+        if ( 'rejected' === $status_code ) {
+            $order->update_status( 'failed' );
+        }
+        if ( 'cancelled' === $status_code ) {
+            $order->update_status( 'cancelled' );
+        }
+        return $order;
+    }
         /**
 …
          * @return mixed
          */
+        public function post_data(WP_REST_Request $request)
+        {
+            $all = $request->get_json_params();
+            $order_id          = $all['package']['reference_code'];
+            $status_code       = $all['status_code'];
+            $shipment          = $this->update_shipment_status($order_id, $status_code);
+            $payload_data_json = wp_json_encode($shipment);
+            return $payload_data_json;
+        }
+    public function post_data( WP_REST_Request $request ) {
+        $all = $request->get_json_params();
+        $order_id          = $all['package']['reference_code'];
+        $status_code       = $all['status_code'];
+        $shipment          = $this->update_shipment_status( $order_id, $status_code );
+        $payload_data_json = wp_json_encode( $shipment );
+        return $payload_data_json;
+    }
             /**
+         * This function gets states from the sendbox call
+         */
+        public function request_states(){
+            // this control will check if the value gotten from ajax is really there
+            if (isset($_POST["data"]) && wp_verify_nonce( $_POST['security'], 'wooss-ajax-security-nonce' )){
+                $country_code_default = sanitize_text_field($_POST['data']);
+                update_option('wooss_selected_country_code_used',$country_code_default);
+                $args                       = array(
+                    'headers' => array(
+                        'Content-Type'  => 'application/json',
+                    ),
+                );
+                $states_api_url = add_query_arg(
+                    array( 'page_by'=> '{"per_page":10000}' , 'filter_by' => '{"country_code":"'.$country_code_default.'"}'), 'https://api.sendbox.co/auth/states' );
+                        $states_data_obj =  wp_remote_get($states_api_url, $args);
+                           $states_body    = json_decode(wp_remote_retrieve_body($states_data_obj));
+                          $html = "";
+                           foreach($states_body as $key => $value){
+                            if (is_array($value)){
+                                sort($value);
+                                foreach($value as $ship_key => $ship_value){
+                                    if (isset($ship_value->code) && isset($ship_value->name)){
+                                        $html.="<option data-country-code-name='".$ship_value->code."'>".$ship_value->name."</option><br/>";
+                                    }
+                                }
+                            }
+                          }
+                       echo $html;
+            }
+            wp_die();
+        }
+    }
+             * This function gets states from the sendbox call
+             */
+    public function request_states() {
+        // this control will check if the value gotten from ajax is really there
+        if ( isset( $_POST['data'] ) && wp_verify_nonce( $_POST['security'], 'wooss-ajax-security-nonce' ) ) {
+            $country_code_default = sanitize_text_field( $_POST['data'] );
+            $sendbox_data         = get_option('sendbox_data');
+            $sendbox_data['wooss_selected_country_code_used'] = $country_code_default;
+            update_option( 'sendbox_data', $sendbox_data );
+            $args                    = array(
+                'timeout' => 30,
+                'headers' => array(
+                    'Content-Type' => 'application/json',
+                ),
+            );
+            $states_api_url          = add_query_arg(
+                array(
+                    'page_by'   => '{"per_page":10000}',
+                    'filter_by' => '{"country_code":"' . $country_code_default . '"}',
+                ),
+                'https://api.sendbox.co/auth/states'
+            );
+                    $states_data_obj = wp_remote_get( $states_api_url, $args );
+                       $states_body = json_decode( wp_remote_retrieve_body( $states_data_obj ) );
+                      $html         = '';
+            foreach ( $states_body as $key => $value ) {
+                if ( is_array( $value ) ) {
+                               sort( $value );
+                    foreach ( $value as $ship_key => $ship_value ) {
+                        if ( isset( $ship_value->code ) && isset( $ship_value->name ) ) {
+                                       $html .= "<option data-country-code-name='" . $ship_value->code . "'>" . $ship_value->name . '</option><br/>';
+                        }
+                    }
+                }
+            }
+                   echo $html;
+        }
+        wp_die();
+    }
+}

sendbox-shipping/trunk/admin/js/wooss-admin.js

-                      r2430827
+                      r2488399
 (function($) {
   "use strict";
+(function ($) {
+    "use strict";
   /**
    * All of the code for your public-facing JavaScript source
    * should reside in this file.
+   *
    * Note: It has been assumed you will write jQuery code here, so the
    * $ function reference has been prepared for usage within the scope
    * of this function.
+   *
    * This enables you to define handlers, for when the DOM is ready:
+   *
    * $(function() {
+   *
    * });
+   *
    * When the window is loaded:
+   *
    * $( window ).load(function() {
+   *
    * });
+   *
    * ...and/or other possibilities.
+   *
    * Ideally, it is not considered best practise to attach more than a
    * single DOM-ready or window-load handler for a particular page.
    * Although scripts in the WordPress core, Plugins and Themes may be
    * practising this, we should strive to set a better example in our own work.
    */
+    /**
+     * All of the code for your public-facing JavaScript source
+     * should reside in this file.
+     *
+     * Note: It has been assumed you will write jQuery code here, so the
+     * $ function reference has been prepared for usage within the scope
+     * of this function.
+     *
+     * This enables you to define handlers, for when the DOM is ready:
+     *
+     * $(function() {
+     *
+     * });
+     *
+     * When the window is loaded:
+     *
+     * $( window ).load(function() {
+     *
+     * });
+     *
+     * ...and/or other possibilities.
+     *
+     * Ideally, it is not considered best practise to attach more than a
+     * single DOM-ready or window-load handler for a particular page.
+     * Although scripts in the WordPress core, Plugins and Themes may be
+     * practising this, we should strive to set a better example in our own work.
+     */
   /* $(window).load(function () {
     $('.loader').fadeOut();
   }); */
+    /* $(window).load(function () {
+      $('.loader').fadeOut();
+    }); */
+  $(document).ready(function() {
+    var select_choosed = $('select[name="wc_order_action"]').val();
+    $('select[name="wc_order_action"]').change(function() {
+      select_choosed = this.value;
+      if (select_choosed == "sendbox_shipping_action") {
+        $("button.button.wc-reload").on("click submit", function(e) {
+          e.preventDefault();
+          $("span#wooss_shipments_data").dialog();
+    $(document).ready(function () {
+        $('select#wooss_destination_country').select2();
+        $('select#wooss_destination_state').select2();
+        var select_choosed = $('select[name="wc_order_action"]').val();
+        $('select[name="wc_order_action"]').change(function () {
+            select_choosed = this.value;
+            if (select_choosed == "sendbox_shipping_action") {
+                $("button.button.wc-reload").on("click submit", function (e) {
+                    e.preventDefault();
+                    $("span#wooss_shipments_data").dialog();
+                });
+            } else {
+                $("span#wooss_shipments_data").hide();
+            }
         });
+      } else {
+        $("span#wooss_shipments_data").hide();
+      }
+        var request_shipment_btn = $("button#wooss_request_shipment");
+        request_shipment_btn.on("submit click", function (e) {
+            e.preventDefault();
+            var wooss_origin_name = $("input[name='wooss_origin_name']").val();
+            var wooss_origin_phone = $("input[name='wooss_origin_phone']").val();
+            var wooss_origin_email = $("input[name='wooss_origin_email']").val();
+            var wooss_origin_country = $("input[name='wooss_origin_country']").val();
+            var wooss_origin_street = $("input[name='wooss_origin_street']").val();
+            var wooss_origin_state = $("input[name='wooss_origin_state']").val();
+            var wooss_origin_city = $("input[name='wooss_origin_city']").val();
+            var wooss_destination_name = $(
+                "input[name = 'wooss_destination_name']"
+            ).val();
+            var wooss_destination_phone = $(
+                "input[name = 'wooss_destination_phone']"
+            ).val();
+            var wooss_destination_email = $(
+                "input[name = 'wooss_destination_email']"
+            ).val();
+            var wooss_destination_street = $(
+                "input[name = 'wooss_destination_street']"
+            ).val();
+            /*  var wooss_destination_country = $(
+               "input[name = 'wooss_destination_country']"
+             ).val();
+             var wooss_destination_state = $(
+               "input[name = 'wooss_destination_state']"
+             ).val();*/
+            var wooss_destination_city = $("input[name = 'wooss_destination_city']").val();
+            var wooss_postal_code = $(
+                "input#wooss_postal_code"
+            ).val();
+            var wooss_selected_courier = $("select#wooss_selected_courier").val();
+            $("select#wooss_selected_courier").change(function () {
+                wooss_selected_courier = $(this).val();
+                //console.log(wooss_selected_courier, "hahh");
+            });
+            var wooss_destination_country = $("select#wooss_destination_country").val();
+            $("select#wooss_destination_country").change(function () {
+                wooss_destination_country = $(this).val();
+            })
+            var wooss_destination_state = $("select#wooss_destination_state").val();
+            $("select#wooss_destination_state").change(function () {
+                wooss_destination_state = $(this).val()
+            })
+            var wooss_country_destination_name = $("input#wooss_destination_city_name").val();
+            var wooss_order_id = $("textarea#wooss_items_list").data("id");
+            $.blockUI({message: 'Requesting shipment...'});
+            var data = {
+                wooss_origin_name: wooss_origin_name,
+                wooss_origin_phone: wooss_origin_phone,
+                wooss_origin_email: wooss_origin_email,
+                wooss_origin_country: wooss_origin_country,
+                wooss_origin_state: wooss_origin_state,
+                wooss_origin_city: wooss_origin_city,
+                wooss_origin_street: wooss_origin_street,
+                wooss_destination_name: wooss_destination_name,
+                wooss_destination_phone: wooss_destination_phone,
+                wooss_destination_email: wooss_destination_email,
+                wooss_destination_country: wooss_destination_country,
+                wooss_destination_state: wooss_destination_state,
+                wooss_destination_street: wooss_destination_street,
+                wooss_destination_city: wooss_country_destination_name,
+                wooss_selected_courier: wooss_selected_courier,
+                wooss_postal_code: wooss_postal_code,
+                wooss_order_id: wooss_order_id
+            };
+            //console.log(wooss_destination_state);
+            $.post(
+                wooss_ajax_object.wooss_ajax_url,
+                {
+                    action: "request_shipments",
+                    data: data,
+                    security: wooss_ajax_object.wooss_ajax_security
+                },
+                function (response) {
+                    $.unblockUI();
+                    if (response == 0) {
+                        alert("An error occured");
+                    } else if (response == 1) {
+                        alert("Shipment Successful");
+                        window.location.reload();
+                    } else if (response == 2 || response == 3) {
+                        alert(
+                            "insufficient funds login to your sendbox account and top up your wallet"
+                        );
+                    }
+                }
+            );
+        });
+        $("select#wooss_selected_courier").change(function (event) {
+            let price =
+                event.target.options[event.target.selectedIndex].dataset.courierPrice;
+            document.getElementById("dabs").innerText = "Fee: ₦" + price;
+            document.getElementById("dabs").style.color = "#ed2f59";
+            //console.log(wooss_selected_courier, "hahh");
+        });
+        /***function to display rates */
+        /***Function to get country code**/
+        var wooss_selected_country, wooss_selected_country_code;
+        $("select#wooss_destination_country").on('change ', function () {
+            var wooss_selected_option = jQuery(this).children("option:selected");
+            wooss_selected_country = wooss_selected_option.val();
+            wooss_selected_country_code = wooss_selected_option.data("countryCode");
+            $.blockUI();
+            $.post(wooss_ajax_object.wooss_ajax_url, {
+                    action: "request_states",
+                    data: wooss_selected_country_code,
+                    security: wooss_ajax_object.wooss_ajax_security
+                },
+                function (response) {
+                    if (response) {
+                        $("select#wooss_destination_state option:gt(0)").remove();
+                        $('select#wooss_destination_state').append(response);
+                        $.unblockUI();
+                    }
+                });
+        });
     });
-    var request_shipment_btn = $("button#wooss_request_shipment");
-    request_shipment_btn.on("submit click", function(e) {
-      e.preventDefault();
-      var wooss_origin_name = $("input[name='wooss_origin_name']").val();
-      var wooss_origin_phone = $("input[name='wooss_origin_phone']").val();
-      var wooss_origin_email = $("input[name='wooss_origin_email']").val();
-      var wooss_origin_country = $("input[name='wooss_origin_country']").val();
-      var wooss_origin_street = $("input[name='wooss_origin_street']").val();
-      var wooss_origin_state = $("input[name='wooss_origin_state']").val();
-      var wooss_origin_city = $("input[name='wooss_origin_city']").val();
-      var wooss_destination_name = $(
-        "input[name = 'wooss_destination_name']"
-      ).val();
-      var wooss_destination_phone = $(
-        "input[name = 'wooss_destination_phone']"
-      ).val();
-      var wooss_destination_email = $(
-        "input[name = 'wooss_destination_email']"
-      ).val();
-      var wooss_destination_street = $(
-        "input[name = 'wooss_destination_street']"
-      ).val();
-     /*  var wooss_destination_country = $(
-        "input[name = 'wooss_destination_country']"
-      ).val();
-      var wooss_destination_state = $(
-        "input[name = 'wooss_destination_state']"
-      ).val();*/
-      var wooss_destination_city = $("input[name = 'wooss_destination_city']").val();
-       var wooss_postal_code = $(
-        "input#wooss_postal_code"
-      ).val();
-      console.log(wooss_postal_code)
-      var wooss_selected_courier = $("select#wooss_selected_courier").val();
-      $("select#wooss_selected_courier").change(function() {
-        wooss_selected_courier = $(this).val();
-     //console.log(wooss_selected_courier, "hahh");
-      });
-      var wooss_destination_country = $("select#wooss_destination_country").val();
-      $("select#wooss_destination_country").change(function(){
-          wooss_destination_country = $(this).val();
-      })
-      var wooss_destination_state = $("select#wooss_destination_state").val();
-      $("select#wooss_destination_state").change(function(){
-          wooss_destination_state = $(this).val()
-      })
-      var wooss_country_destination_name =  $("input#wooss_destination_city_name").val();
-      var wooss_order_id = $("textarea#wooss_items_list").data("id");
-$.blockUI({message:'Requesting shipment...'});
-      var data = {
-        wooss_origin_name: wooss_origin_name,
-        wooss_origin_phone: wooss_origin_phone,
-        wooss_origin_email: wooss_origin_email,
-        wooss_origin_country: wooss_origin_country,
-        wooss_origin_state: wooss_origin_state,
-        wooss_origin_city: wooss_origin_city,
-        wooss_origin_street: wooss_origin_street,
-        wooss_destination_name: wooss_destination_name,
-        wooss_destination_phone: wooss_destination_phone,
-        wooss_destination_email: wooss_destination_email,
-        wooss_destination_country: wooss_destination_country,
-        wooss_destination_state: wooss_destination_state,
-        wooss_destination_street: wooss_destination_street,
-        wooss_destination_city: wooss_country_destination_name,
-        wooss_selected_courier: wooss_selected_courier,
-        wooss_postal_code:wooss_postal_code,
-        wooss_order_id: wooss_order_id
-      };
-      //console.log(wooss_destination_state);
-      $.post(
-        wooss_ajax_object.wooss_ajax_url,
+        {
-          action: "request_shipments",
-          data: data,
-          security: wooss_ajax_object.wooss_ajax_security
-        },
-        function(response) {
-            $.unblockUI();
-          if (response == 0) {
-            alert("An error occured");
-          } else if (response == 1) {
-            window.location.reload();
-          } else if (response == 2 || response == 3 ) {
-            alert(
-              "insufficient funds login to your sendbox account and top up your wallet"
-            );
+          }
+        }
-      );
-    });
-    $("select#wooss_selected_courier").change(function(event) {
-      let price =
-        event.target.options[event.target.selectedIndex].dataset.courierPrice;
-      document.getElementById("dabs").innerText = "Fee: ₦" + price;
-      document.getElementById("dabs").style.color = "#ed2f59";
-       //console.log(wooss_selected_courier, "hahh");
-    });
-    /***function to display rates */
-    /***Function to get country code**/
-    var wooss_selected_country, wooss_selected_country_code;
-    $("select#wooss_destination_country").on('change ',function(){
-        var wooss_selected_option = jQuery(this).children("option:selected");
-        wooss_selected_country = wooss_selected_option.val();
-        wooss_selected_country_code = wooss_selected_option.data("countryCode"); $.blockUI();
-     $.post(wooss_ajax_object.wooss_ajax_url,{action: "request_states",
-          data: wooss_selected_country_code,
-          security: wooss_ajax_object.wooss_ajax_security},
-          function(response){
-            if (response){
-                $("select#wooss_destination_state option:gt(0)").remove();
-                $('select#wooss_destination_state').append(response);
-                $.unblockUI();
+            }
-          });
-});
-  });
 })(jQuery);

sendbox-shipping/trunk/includes/assets/js/script.js

-                      r2430941
+                      r2488399
       ) {
         $("div.wooss-shipping-settings").hide();
+        if ($(this).prop("checked")) {
+        $('p.submit').show();
+        if ($(this).prop("checked") ) {
           $("div.wooss-shipping-settings").show();
+          $('p.submit').hide();
+        }
       });
 …
       var wc_button_save = $("button.button-primary.woocommerce-save-button");
       wc_button_save.show();
-      //var wooss_basic_auth;
       var sendbox_auth_token;
       var sendbox_refresh_token;
       var sendbox_app_id;
       var sendbox_client_secret;
+      var sendbox_client_secret;
       var wooss_connect_btn = $("button.wooss-connect-sendbox");
       var wooss_errors_message_span = $("span.wooss_errors_pages");
 …
       wooss_connect_btn.on("click", function (e) {
         e.preventDefault();
+        e.preventDefault();
         var formDetails = $('form').serializeJSON();
       console.log(formDetails.wooss);
         function reloadPage() {
+          $('p.submit').show();
           window.location.reload();
+        }
 …
               ).insertAfter("br.clear");
               setTimeout(reloadPage, 10000);
             } else if (0 == response) {
               wooss_errors_message_span
                 .append(
                   "Invalid access and refresh token login to sendbox and get the correct tokens"
+                  "Invalid access and refresh token login to sendbox, please can you provide the right ones in order to get the right credentials."
+                )
                 .show();
 …
       wooss_button_save.on("submit click", function (e) {
         e.preventDefault();
         var wooss_state_name = $("select.wooss_state_dropdown").val();
+        var wooss_state_name = $("select.wooss_state_name").val();
         var wooss_country = $("select.wooss_country_select").val();
         var wooss_city = $("input[name='wooss_city']").val();
 …
         var wooss_pickup_type = $("select.wooss_pickup_type").val();
         var wooss_rates_type = $("select.wooss_rates_type").val();
-        //wooss_basic_auth = $("input[name='wooss_basic_auth']").val();
         sendbox_auth_token = $("input[name='sendbox_auth_token']").val();
         sendbox_refresh_token = $("input[name='sendbox_refresh_token']").val();
 …
           wooss_city: wooss_city,
           wooss_street: wooss_street,
-          //wooss_basic_auth: wooss_basic_auth,
           sendbox_auth_token: sendbox_auth_token,
           sendbox_refresh_token: sendbox_refresh_token,
 …
                 '<div id="message" class="updated inline"><p><strong>Your settings have been synced.</strong></p></div>'
               ).insertAfter("br.clear");
+              alert('Your settings have been synced successful.');
+              $('button.wooss_sync_changes_btn').hide();
+              $('p.submit').show();
             } else {
               alert("Sendbox Error !!!");
+              alert("Sendbox: An error has occured, please reach our support on WordPress.org :) thank you for using our plugin.");
+            }
+          }

sendbox-shipping/trunk/includes/class-wooss-sendbox-shipping-api.php

-                      r2430827
+                      r2488399
  * This class makes a call to sendbox API
  */
+class Wooss_Sendbox_Shipping_API
+{
+class Wooss_Sendbox_Shipping_API {
     /**
      * Connect_to_api.
+     *
      * @param  mixed $api_url API URL.
      * @param  mixed $args arguments.
      * @param  mixed $method_type GET|POST.
+     * @param mixed $api_url API URL.
+     * @param mixed $args arguments.
+     * @param mixed $method_type GET|POST.
+     *
      * @return mixed
      */
+    public function connect_to_api($api_url, $args, $method_type)
+    {
+        if ('GET' == $method_type) {
+            $response = wp_remote_get(esc_url_raw($api_url), $args);
+        } elseif ('POST' == $method_type) {
+            $response = wp_remote_post(esc_url_raw($api_url), $args);
+    public function connect_to_api( $api_url, $args, $method_type ) {
+        if ( 'GET' == $method_type ) {
+            $response = wp_remote_get( esc_url_raw( $api_url ), $args );
+        } elseif ( 'POST' == $method_type ) {
+            $response = wp_remote_post( esc_url_raw( $api_url ), $args );
+        }
 …
      * Get_api_response_code.
+     *
      * @param  mixed $api_url API URL.
      * @param  mixed $args Parameters, Array is required with credentials.
      * @param  mixed $method (GET|POST).
+     * @param mixed $api_url API URL.
+     * @param mixed $args Parameters, Array is required with credentials.
+     * @param mixed $method (GET|POST).
+     *
      * @return object
      */
     public function get_api_response_code($api_url, $args, $method)
+    {
         $api_call      = $this->connect_to_api($api_url, $args, $method);
+        $response_code = wp_remote_retrieve_response_code($api_call);
+    public function get_api_response_code( $api_url, $args, $method ) {
+        $api_call      = $this->connect_to_api( $api_url, $args, $method );
+        $response_code = wp_remote_retrieve_response_code( $api_call );
         return $response_code;
+    }
 …
      * This function gets body content from  api.
+     *
      * @param  mixed $api_url API URL.
      * @param  mixed $args Parameters, Array is required with credentials.
      * @param  mixed $method (GET|POST).
+     * @param mixed $api_url API URL.
+     * @param mixed $args Parameters, Array is required with credentials.
+     * @param mixed $method (GET|POST).
+     *
      * @return object
      */
     public function get_api_response_body($api_url, $args, $method)
+    {
         $api_call      = $this->connect_to_api($api_url, $args, $method);
+        $response_body = json_decode(wp_remote_retrieve_body($api_call));
+    public function get_api_response_body( $api_url, $args, $method ) {
+        $api_call      = $this->connect_to_api( $api_url, $args, $method );
+        $response_body = json_decode( wp_remote_retrieve_body( $api_call ) );
         return $response_body;
+    }
 …
      * This function returns the necessary url that needs Sendbox.
+     *
      * @param  mixed $url_type URL Type.
+     * @param mixed $url_type URL Type.
+     *
      * @return string
      */
+    public function get_sendbox_api_url($url_type)
+    {
+        if ('delivery_quote' == $url_type) {
+    public function get_sendbox_api_url( $url_type ) {
+        if ( 'delivery_quote' == $url_type ) {
             $url = 'https://live.sendbox.co/shipping/shipment_delivery_quote';
         } elseif ('countries' == $url_type) {
+        } elseif ( 'countries' == $url_type ) {
             $url = 'https://api.sendbox.co/auth/countries?page_by={' . '"per_page"' . ':264}';
         } elseif ('states' == $url_type) {
+        } elseif ( 'states' == $url_type ) {
             $url = 'https://api.sendbox.co/auth/states';
         } elseif ('shipments' == $url_type) {
+        } elseif ( 'shipments' == $url_type ) {
             $url = 'https://live.sendbox.co/shipping/shipments';
         } elseif ('item_type' == $url_type) {
+        } elseif ( 'item_type' == $url_type ) {
             $url = 'https://api.sendbox.ng/v1/item_types';
         } elseif ('profile' == $url_type) {
+        } elseif ( 'profile' == $url_type ) {
             $url = 'https://live.sendbox.co/oauth/profile';
         } else {
             $url = '';
+        }
         return $url;
+    }
 …
     /**
+ *
+ * This function checks sendbox oauth
+ */
+public static function checkAuth(){
+    $api_key = get_option('sendbox_data')['sendbox_auth_token'];
+    $profile_url = "https://live.sendbox.co/oauth/profile";
+    $profile_res = wp_remote_get( $profile_url ,
+    array( 'timeout' => 40,
+   'headers' => array( 'Content-Type' => 'application/json',
+                      'Authorization'=> $api_key )
+    ));
+    //var_dump($profile_res);
+    $profile_obj = json_decode($profile_res['body']);
+   if(isset($profile_obj->title)){
+   //make a new request to oauth
+   $s_url = 'https://live.sendbox.co/oauth/access/access_token/refresh?';
+   //('sendbox_data')['sendbox_auth_token']
+   $app_id = get_option('sendbox_data')['sendbox_app_id'];
+   $client_secret = get_option('sendbox_data')['sendbox_client_secret'];
+   $url_oauth = $s_url.'app_id='.$app_id.'&client_secret='.$client_secret;
+   $refresh_token = get_option('sendbox_data')['sendbox_refresh_token'];
+   $oauth_res = wp_remote_get( $url_oauth,
+    array( 'timeout' => 10,
+   'headers' => array( 'Content-Type' => 'application/json',
+                      'Refresh-Token'=> $refresh_token )
+    ));
+    $oauth_obj = json_decode($oauth_res['body']);
+   if(isset($oauth_obj->access_token)){
+       $new_auth = $oauth_obj->access_token;
+       $sendbox_new_auth = get_option('sendbox_data');
+       $sendbox_new_auth['sendbox_auth_token']= $new_auth;
+       update_option('sendbox_data',$sendbox_new_auth);
+   }
+   if(isset($oauth_obj->refresh_token)){
+       $new_refresh = $oauth_obj->refresh_token;
+       $sendbox_new_refresh = get_option('sendbox_data');
+       $sendbox_new_refresh['sendbox_refresh_token'] = $new_refresh;
+       update_option('sendbox_data',  $sendbox_new_refresh);
+   }
+     *
+     * This function checks sendbox oauth
+     */
+    public static function checkAuth() {
+        $sendbox_data_db = get_option( 'sendbox_data' );
+        $api_key         = $sendbox_data_db['sendbox_auth_token'];
+        $profile_url     = 'https://live.sendbox.co/oauth/profile';
+        $profile_res = wp_remote_get(
+            $profile_url,
+            array(
+                'timeout' => 40,
+                'headers' => array(
+                    'Content-Type'  => 'application/json',
+                    'Authorization' => $api_key,
+                ),
+            )
+        );
+        $class_name  = 'WP_Error';
+        if ( ! ( $profile_res instanceof $class_name ) && isset( $profile_res['body'] )  ) {
+            $profile_obj = json_decode( $profile_res['body'] );
+        } else {
+            $profile_obj = null;
+        }
+        if ( isset( $profile_obj->title ) ) {
+            $s_url         = 'https://live.sendbox.co/oauth/access/access_token/refresh?';
+            $app_id        = $sendbox_data_db['sendbox_app_id'];
+            $client_secret = $sendbox_data_db['sendbox_client_secret'];
+            $url_oauth     = $s_url . 'app_id=' . $app_id . '&client_secret=' . $client_secret;
+            $refresh_token = $sendbox_data_db['sendbox_refresh_token'];
+            $oauth_res = wp_remote_get(
+                $url_oauth,
+                array(
+                    'timeout' => 10,
+                    'headers' => array(
+                        'Content-Type'  => 'application/json',
+                        'Refresh-Token' => $refresh_token,
+                    ),
+                )
+            );
+            $oauth_obj = json_decode( $oauth_res['body'] );
+            if ( ! ( $oauth_res instanceof $class_name ) && ! isset( $oauth_res['body'] ) ) {
+                return $api_key;
+            }
+            if ( isset( $oauth_obj->access_token ) ) {
+                $new_auth                              = $oauth_obj->access_token;
+                $sendbox_data_db['sendbox_auth_token'] = $new_auth;
+                update_option( 'sendbox_data', $sendbox_data_db );
+            }
+            if ( isset( $oauth_obj->refresh_token ) ) {
+                $new_refresh                              = $oauth_obj->refresh_token;
+                $sendbox_data_db['sendbox_refresh_token'] = $new_refresh;
+                update_option( 'sendbox_data', $sendbox_data_db );
+            }
+        }
+        return $api_key;
+    }
+    /**
+     * Static function for getting nigeria states.
+     *
+     * @return array
+     */
+    public function get_nigeria_states() {
+        $state = array(
+            'Abia',
+            'Adamawa',
+            'Akwa Ibom',
+            'Anambra',
+            'Bauchi',
+            'Benue',
+            'Borno',
+            'Bayelsa',
+            'Cross River',
+            'Delta',
+            'Ebonyi ',
+            'Edo',
+            'Ekiti',
+            'Enugu ',
+            'Federal Capital Territory',
+            'Gombe ',
+            'Jigawa ',
+            ' Imo ',
+            ' Kaduna',
+            'Kebbi ',
+            'Kano',
+            ' Kogi',
+            ' Lagos',
+            'Katsina',
+            'Kwara',
+            'Nasarawa',
+            'Niger ',
+            'Ogun',
+            'Ondo ',
+            'Rivers',
+            'Oyo',
+            'Osun',
+            'Sokoto',
+            'Plateau',
+            'Taraba',
+            'Yobe',
+            'Zamfara',
+        );
+        return $state;
+    }
+}
+else{
+   $api_key = get_option('sendbox_data')['sendbox_auth_token'];
+}
+return $api_key;
+}
+    /**
+     * Static function for getting nigeria states.
+     *
+     * @return array
+     */
+    public function get_nigeria_states()
+    {
+        $state = array('Abia', 'Adamawa', 'Akwa Ibom', 'Anambra', 'Bauchi', 'Benue', 'Borno', 'Bayelsa', 'Cross River', 'Delta', 'Ebonyi ', 'Edo', 'Ekiti', 'Enugu ', 'Federal Capital Territory', 'Gombe ', 'Jigawa ', ' Imo ', ' Kaduna', 'Kebbi ', 'Kano', ' Kogi', ' Lagos', 'Katsina', 'Kwara', 'Nasarawa', 'Niger ', 'Ogun', 'Ondo ', 'Rivers', 'Oyo', 'Osun', 'Sokoto', 'Plateau', 'Taraba', 'Yobe', 'Zamfara');
+        return $state;
+    }
+}

sendbox-shipping/trunk/includes/class-wooss-shipping-method.php

-                      r2430827
+                      r2488399
  * @return mixed $string
  */
+function wooss_shipping_method()
+{
+    if (!class_exists('Wooss_Shipping_Method')) {
+function wooss_shipping_method() {
+    if ( ! class_exists( 'Wooss_Shipping_Method' ) ) {
         /**
          * WooCommerce Sendbox Shipping Method Init Class.
 …
          * @return mixed $string
          */
+        class Wooss_Shipping_Method extends WC_Shipping_Method
+        {
+        class Wooss_Shipping_Method extends WC_Shipping_Method {
             /**
 …
              * @return void
              */
+            public function __construct($instance_id = 0)
+            {
+                $this->id                   = 'wooss';
+                $this->instance_id          = absint($instance_id);
+                $this->method_title         = __('Sendbox Shipping', 'wooss');
+                $this->method_description   = __('Sendbox Custom Shipping Method for Woocommerce', 'wooss');
+                $this->single_rate          = 0;
+                $this->supports             = array(
+            public function __construct( $instance_id = 0 ) {
+                $this->id                 = 'wooss';
+                $this->instance_id        = absint( $instance_id );
+                $this->method_title       = __( 'Sendbox Shipping', 'wooss' );
+                $this->method_description = __( 'Sendbox Custom Shipping Method for Woocommerce', 'wooss' );
+                $this->single_rate        = 0;
+                $this->supports           = array(
                     'shipping-zones',
                     'instance-settings',
 …
                     'instance-settings-modal',
                 );
                 $this->version              = WOOSS_VERSION;
+                $this->version            = WOOSS_VERSION;
                 $this->init_form_fields();
                 $this->init_settings();
                 $this->enabled          = isset($this->settings['enabled']) ? $this->settings['enabled'] : 'yes';
+                $this->enabled              = isset( $this->settings['enabled'] ) ? $this->settings['enabled'] : 'yes';
                 $this->instance_form_fields = array(
                     'enabled' => array(
                         'title'   => __('Enable/Disable', 'wooss'),
+                        'title'   => __( 'Enable/Disable', 'wooss' ),
                         'type'    => 'checkbox',
                         'label'   => __('Enable this shipping method'),
+                        'label'   => __( 'Enable this shipping method' ),
                         'default' => $this->enabled,
                     ),
                 );
                 $this->title            = isset($this->settings['title']) ? $this->settings['title'] : __('Sendbox Shipping', 'wooss');
                 $this->shipping_options = 'wooss_eee';
                 if (null !== $this->enabled) {
                     update_option('wooss_option_enable', $this->enabled);
+                $this->title                = isset( $this->settings['title'] ) ? $this->settings['title'] : __( 'Sendbox Shipping', 'wooss' );
+                $this->shipping_options     = 'wooss_eee';
+                if ( null !== $this->enabled ) {
+                    update_option( 'wooss_option_enable', $this->enabled );
+                }
                 add_action('woocommerce_update_options_shipping_' . $this->id, array($this, 'process_admin_options'));
+                add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) );
+            }
             /**
 …
              * @return void
              */
+            function init_form_fields()
+            {
+            function init_form_fields() {
                 $this->form_fields = array(
                     'enabled' => array(
                         'title'   => __('Enable/Disable'),
+                        'title'   => __( 'Enable/Disable' ),
                         'type'    => 'checkbox',
                         'label'   => __('Enable this shipping method'),
+                        'label'   => __( 'Enable this shipping method' ),
                         'default' => 'yes',
                     ),
                 );
                 add_action('woocommerce_update_options_shipping_' . $this->id, array($this, 'process_admin_options'));
+                add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) );
+            }
             /**
+            /*
              * Calculate  fees for the shipping method on the frontend.
+             *
 …
              * @return void
              */
+            public function calculate_shipping($package = array())
+            {
+                if (is_cart() || is_checkout()) {
+            public function calculate_shipping( $package = array() ) {
+                if ( is_cart() || is_checkout() ) {
                     $api_call         = new Wooss_Sendbox_Shipping_API();
                     $quotes_fee       = 0;
                     $fee              = 0;
                     $quantity         = 0;
+                    $items_lists      = [];
+                    $wooss_extra_fees = esc_attr(get_option('wooss_extra_fees'));
+                    foreach ($package['contents'] as $item_id => $values) {
+                        if (!empty($values['data']->get_weight())) {
+                    $items_lists      = array();
+                    $sendbox_data     = get_option( 'sendbox_data' );
+                    $wooss_extra_fees = esc_attr( $sendbox_data[ 'wooss_extra_fees' ] );
+                    foreach ( $package['contents'] as $item_id => $values ) {
+                        if ( ! empty( $values['data']->get_weight() ) ) {
                             $weight = $values['data']->get_weight();
                         } else {
                             $weight = 0;
+                        }
                         $fee      += round($values['line_total']);
+                        $fee      += round( $values['line_total'] );
                         $quantity += $values['quantity'];
 …
                         $outputs->package_size_code = 'medium';
                         $outputs->quantity          = $values['quantity'];
                         $outputs->value             = round($values['line_total']);
                         $outputs->amount_to_receive = round($values['line_total']);
+                        $outputs->value             = round( $values['line_total'] );
+                        $outputs->amount_to_receive = round( $values['line_total'] );
                         $outputs->item_type         = $values['data']->get_categories();
                         array_push($items_lists, $outputs);
+                    }
+                    //$auth_header = get_option('wooss_basic_auth');
+                        array_push( $items_lists, $outputs );
+                    }
                     $auth_header = Wooss_Sendbox_Shipping_API::checkAuth();
                     if (!$auth_header){
                         wc_add_notice(sprintf('<strong>Unable to get shipping fees at this time.</strong>'), 'error');
+                    }
                     $origin_country = "Nigeria";//get_option('wooss_country');
                     $origin_state = get_option('sendbox_data')['wooss_state_dropdown'];
                     $origin_street = get_option('sendbox_data')['wooss_street'];
                     $origin_city = get_option('sendbox_data')['wooss_city'];
                     $incoming_option_code = get_option('sendbox_data')['wooss_pickup_type'];
                     $profile_url                    = $api_call->get_sendbox_api_url('profile');
+                    if ( ! $auth_header ) {
+                        wc_add_notice( sprintf( '<strong>Unable to get shipping fees at this time.</strong>' ), 'error' );
+                    }
+                    $origin_country = 'Nigeria';// get_option('wooss_country');
+                    $origin_state = $sendbox_data['wooss_state_name'];
+                    $origin_street = $sendbox_data['wooss_street'];
+                    $origin_city = $sendbox_data['wooss_city'];
+                    $incoming_option_code = $sendbox_data['wooss_pickup_type'];
+                    $profile_url                    = $api_call->get_sendbox_api_url( 'profile' );
                     $profile_args                   = array(
+                        'timeout' => 30,
                         'headers' => array(
                             'Content-Type'  => 'application/json',
 …
                         ),
                     );
                     $response_code_from_profile_api = $api_call->get_api_response_code($profile_url, $profile_args, 'GET');
                     $response_body_from_profile_api = $api_call->get_api_response_body($profile_url, $profile_args, 'GET');
                     if (200 === $response_code_from_profile_api) {
+                    $response_code_from_profile_api = $api_call->get_api_response_code( $profile_url, $profile_args, 'GET' );
+                    $response_body_from_profile_api = $api_call->get_api_response_body( $profile_url, $profile_args, 'GET' );
+                    if ( 200 === $response_code_from_profile_api ) {
                         $origin_name  = $response_body_from_profile_api->name;
                         $origin_phone = $response_body_from_profile_api->phone;
 …
+                    }
                     $date = new DateTime();
                     $date->modify('+1 day');
                     $pickup_date = $date->format(DateTime::ATOM);
+                    $date->modify( '+1 day' );
+                    $pickup_date = $date->format( DateTime::ATOM );
                     $destination_state_code = $package['destination']['country'];
                     $destination_city       = $package['destination']['city'];
                     $destination_street     = $package['destination']['address'];
+                    if (empty($destination_street)) {
+                        $destination_street = __('Customer street');
+                    }
+                    $destination_name  = __('Customer X', 'wooss');
+                    $destination_phone = __('00000000', 'wooss');
+                    $destination_country = wooss_get_countries($package,'country');
+                    $destination_state = wooss_get_countries($package,'state');
+                    if (preg_match('/\s\(\w+\)/', $destination_country) == true) {
+                        $destination_country = preg_replace('/\s\(\w+\)/', '', $destination_country);
+                    }
+                    if (preg_match('/(\s\(\w+\)\s)|(\s\(\w+\))|(\(\w+\)\s)|(\(\w+\))/', $destination_country) == true) {
+                        $destination_country = preg_replace('/(\s\(\w+\)\s)|(\s\(\w+\))|(\(\w+\)\s)|(\(\w+\))/', '', $destination_country);
+                    }
+                    if (preg_match('/United States/', $destination_country) == true) {
+                        $destination_country = "United States of America";
+                    }
+                    if (empty($destination_state)) {
+                        //$destination_state = $package['destination']['state'];
+                        $destination_state = "London";
+                    }
+                    if (empty($destination_city)) {
+                    if ( empty( $destination_street ) ) {
+                        $destination_street = __( 'Customer street' );
+                    }
+                    $destination_name  = __( 'Customer X', 'wooss' );
+                    $destination_phone = __( '00000000', 'wooss' );
+                    $destination_country = wooss_get_countries( $package, 'country' );
+                    $destination_state   = wooss_get_countries( $package, 'state' );
+                    if ( preg_match( '/\s\(\w+\)/', $destination_country ) == true ) {
+                        $destination_country = preg_replace( '/\s\(\w+\)/', '', $destination_country );
+                    }
+                    if ( preg_match( '/(\s\(\w+\)\s)|(\s\(\w+\))|(\(\w+\)\s)|(\(\w+\))/', $destination_country ) == true ) {
+                        $destination_country = preg_replace( '/(\s\(\w+\)\s)|(\s\(\w+\))|(\(\w+\)\s)|(\(\w+\))/', '', $destination_country );
+                    }
+                    if ( preg_match( '/United States/', $destination_country ) == true ) {
+                        $destination_country = 'United States of America';
+                    }
+                    if ( empty( $destination_state ) ) {
+                        // $destination_state = $package['destination']['state'];
+                        $destination_state = 'London';
+                    }
+                    if ( empty( $destination_city ) ) {
                         $destination_city = $package['destination']['city'];
+                    }
+                    // if (empty($destination_state)) {
+                    //  $destination_state = $destination_state;
+                    // }
+                    $weight = $quantity * $weight;
+                    $weight             = $quantity * $weight;
                     $payload_array_data = array(
                         'destination_name' => $destination_name,
                         'destination_phone' => $destination_phone,
                         'destination_country' => $destination_country,
                         'destination_state' => $destination_state,
                         'destination_street' => $destination_street,
                         'destination_city' => $destination_city,
                         'items_list' => $items_lists,
                         'weight' => $weight,
                         'amount_to_receive' => (int) $fee,
                         'origin_country' => $origin_country,
                         'origin_name' => $origin_name,
                         'origin_street' => $origin_street,
                         'origin_state' => $origin_state,
                         'origin_phone' => $origin_phone,
                         'origin_city' => $origin_city,
+                        'destination_name'      => $destination_name,
+                        'destination_phone'     => $destination_phone,
+                        'destination_country'   => $destination_country,
+                        'destination_state'     => $destination_state,
+                        'destination_street'    => $destination_street,
+                        'destination_city'      => $destination_city,
+                        'items_list'            => $items_lists,
+                        'weight'                => $weight,
+                        'amount_to_receive'     => (int) $fee,
+                        'origin_country'        => $origin_country,
+                        'origin_name'           => $origin_name,
+                        'origin_street'         => $origin_street,
+                        'origin_state'          => $origin_state,
+                        'origin_phone'          => $origin_phone,
+                        'origin_city'           => $origin_city,
                         'deliver_priority_code' => 'next_day',
                         'deliver_type_code' => 'last_mile',
                         'payment_option_code' => 'prepaid',
                         'incoming_option_code' => $incoming_option_code,
                         'pickup_date' => $pickup_date,
+                        'deliver_type_code'     => 'last_mile',
+                        'payment_option_code'   => 'prepaid',
+                        'incoming_option_code'  => $incoming_option_code,
+                        'pickup_date'           => $pickup_date,
                     );
+                        //var_dump($payload_array_data);
+                    $delivery_quotes_details = wooss_calculate_shipping($api_call,$payload_array_data,$auth_header);
+                //  var_dump($delivery_quotes_details);
+                    //die();
+                    $wooss_rates_type = get_option('sendbox_data')['wooss_rates_type'];
+                    if ("maximum" == $wooss_rates_type && isset($delivery_quotes_details->max_quoted_fee) ) {
+                    $delivery_quotes_details = wooss_calculate_shipping( $api_call, $payload_array_data, $auth_header );
+                    $wooss_rates_type = $sendbox_data['wooss_rates_type'];
+                    if ( 'maximum' == $wooss_rates_type && isset( $delivery_quotes_details->max_quoted_fee ) ) {
                         $quotes_fee = $delivery_quotes_details->max_quoted_fee;
                     } elseif ("minimum" == $wooss_rates_type && isset($delivery_quotes_details->min_quoted_fee) ) {
+                    } elseif ( 'minimum' == $wooss_rates_type && isset( $delivery_quotes_details->min_quoted_fee ) ) {
                         $quotes_fee = $delivery_quotes_details->min_quoted_fee;
+                    }
                     $quoted_fee = $quotes_fee + $wooss_extra_fees;
                     /* $destination_country = "United States of America";
+                    /*
+                     $destination_country = "United States of America";
                     $destination_state = "Washington";
                     $destination_city = "New York";
                     $destination_postcode = "10001"; */
                     $payload_array_data['destination_country'] = $destination_country;
+                    $payload_array_data['destination_state'] = $destination_state;
+                    $payload_array_data['destination_city'] = $destination_city;
+                    if (floatval($quoted_fee) == 0){
+                        $delivery_quotes_details = wooss_calculate_shipping($api_call,$payload_array_data,$auth_header);
+                        if ("maximum" == $wooss_rates_type && isset($delivery_quotes_details->max_quoted_fee) ) {
+                    $payload_array_data['destination_state']   = $destination_state;
+                    $payload_array_data['destination_city']    = $destination_city;
+                    if ( (int)$quoted_fee == 0 ) {
+                        $delivery_quotes_details = wooss_calculate_shipping( $api_call, $payload_array_data, $auth_header );
+                        if ( 'maximum' == $wooss_rates_type && isset( $delivery_quotes_details->max_quoted_fee ) ) {
                             $quotes_fee = $delivery_quotes_details->max_quoted_fee;
                         } elseif ("minimum" == $wooss_rates_type && isset($delivery_quotes_details->min_quoted_fee) ) {
+                        } elseif ( 'minimum' == $wooss_rates_type && isset( $delivery_quotes_details->min_quoted_fee ) ) {
                             $quotes_fee = $delivery_quotes_details->min_quoted_fee;
+                        }
                         $quoted_fee = $quotes_fee + $wooss_extra_fees;
+                    }
                     $new_rate = array(
                         'id'      => $this->id,
 …
                     );
                     $this->add_rate($new_rate);
+                    $this->add_rate( $new_rate );
+                }
+            }
 …
+    }
+}
 add_action('woocommerce_shipping_init', 'wooss_shipping_method');
+add_action( 'woocommerce_shipping_init', 'wooss_shipping_method' );
 /**
  * This function is responsible to display class in the settings.
 …
  * @return array
  */
+function add_wooss_shipping_method($methods)
+{
+function add_wooss_shipping_method( $methods ) {
     $methods['wooss'] = 'Wooss_Shipping_Method';
     return $methods;
+}
 add_filter('woocommerce_shipping_methods', 'add_wooss_shipping_method');
 add_action('woocommerce_settings_tabs_shipping', 'wooss_form_fields', 100);
+add_filter( 'woocommerce_shipping_methods', 'add_wooss_shipping_method' );
+add_action( 'woocommerce_settings_tabs_shipping', 'wooss_form_fields', 100 );
 /**
 …
  * @return void
  */
+function wooss_form_fields()
+{
+    $sendbox_auth_header = Wooss_Sendbox_Shipping_API::checkAuth();
+    $shipping_methods_enabled = get_option('wooss_option_enable');
+    if (isset($_GET['tab']) && $_GET['tab'] == 'shipping' &&  isset($_GET['section']) && $_GET['section'] == 'wooss' && $shipping_methods_enabled == 'yes') {
+        $api_call                   = new Wooss_Sendbox_Shipping_API();
+        //$auth_header                = esc_attr(get_option('wooss_basic_auth'));
+        //$auth_header                = esc_attr(get_option('sendbox_data')['sendbox_auth_token']);
+function wooss_form_fields() {
+    $shipping_methods_enabled = get_option( 'wooss_option_enable' );
+    if ( isset( $_GET['tab'] ) && ( $_GET['tab'] == 'shipping' && isset( $_GET['section'] ) && $_GET['section'] == 'wooss' && $shipping_methods_enabled == 'yes' )  ) {
+        ?>
+        <style>
+            p.submit{
+                display:none;
+            }
+        </style>
+        <?php
+        $sendbox_auth_header = Wooss_Sendbox_Shipping_API::checkAuth();
+        $api_call            = new Wooss_Sendbox_Shipping_API();
+        $sendbox_data        = get_option( 'sendbox_data' );
         $auth_header                = $sendbox_auth_header;
         $args                       = array(
             'headers' => array(
+                'timeout'       => 30,
                 'Content-Type'  => 'application/json',
                 'Authorization' => $auth_header,
 …
         );
         $profile_api_url            = 'https://live.sendbox.co/oauth/profile';
         $profile_data_response_code = $api_call->get_api_response_code($profile_api_url, $args, 'GET');
         $profile_data_response_body = $api_call->get_api_response_body($profile_api_url, $args, 'GET');
+        $profile_data_response_code = $api_call->get_api_response_code( $profile_api_url, $args, 'GET' );
+        $profile_data_response_body = $api_call->get_api_response_body( $profile_api_url, $args, 'GET' );
         $wooss_username             = '';
         $wooss_email                = '';
         $wooss_tel                  = '';
         if (200 == $profile_data_response_code) {
+        if ( 200 == $profile_data_response_code ) {
             $wooss_username = $profile_data_response_body->name;
             $wooss_email    = $profile_data_response_body->email;
             $wooss_tel      = $profile_data_response_body->phone;
+        }
+        $wc_city             = get_option('woocommerce_store_city');
+        $wc_store_address    = get_option('woocommerce_store_address');
+        $wooss_city          = get_option('sendbox_data')['wooss_city'];
+        $wooss_store_address = get_option('wooss_store_address');
+        //$wooss_basic_auth    = get_option('wooss_basic_auth');
+        $wc_extra_fees       = (int) get_option('sendbox_data')['wooss_extra_fees'];
+        if (null == $wooss_city) {
+        $wc_city             = get_option( 'woocommerce_store_city' );
+        $wc_store_address    = get_option( 'woocommerce_store_address' );
+        $wooss_city          = $sendbox_data['wooss_city'];
+        $wooss_store_address = $sendbox_data['wooss_store_address'];
+        $wc_extra_fees       = (int) $sendbox_data['wooss_extra_fees'];
+        if ( ! $wooss_city ) {
             $wooss_city = $wc_city;
+        }
         if (null == $wooss_store_address) {
+        if ( ! $wooss_store_address ) {
             $wooss_store_address = $wc_store_address;
+        }
         $wooss_states_selected = get_option('wooss_states_selected');
         if (null == $wooss_states_selected) {
             $wooss_states_selected = '';
+        }
         $wooss_country = get_option('wooss_country');
         if (null == $wooss_country) {
+        $wooss_states_selected = $sendbox_data['wooss_state_name'];
+        if ( is_null( $wooss_states_selected ) || ! $wooss_states_selected ) {
+            $wooss_states_selected = 'no_state';
+        }
+        $wooss_country = $sendbox_data['wooss_country'];
+        if ( ! $wooss_country ) {
             $wooss_country = 'Nigeria';
+        }
+        //$wooss_connection_status = get_option('wooss_basic_auth');
         $wooss_connection_status =get_option('sendbox_data')['sendbox_auth_token'];
+        //var_dump();
         $custom_styles           = '';
         if (null != $wooss_connection_status) {
+        $wooss_connection_status = $sendbox_data['sendbox_auth_token'];
+        $custom_styles = '';
+        if ( $wooss_connection_status ) {
             $custom_styles = 'display:none';
+        }
+        //var_dump($custom_styles);
+        $wooss_display_fields = get_option('wooss_connection_status');
+        //var_dump($wooss_display_fields);
+        if ( $wooss_display_fields) {
+            $display_fields = 'display : inline';
+            $hide_button    = 'display : none';
+        }
+        $wooss_pickup_type = get_option('sendbox_data')['wooss_pickup_type'];
+        if (null == $wooss_pickup_type) {
+        $wooss_display_fields = get_option( 'wooss_connection_status' );
+        $wooss_pickup_type = $sendbox_data['wooss_pickup_type'];
+        if ( ! $wooss_pickup_type ) {
             $wooss_pickup_type = 'pickup';
+        }
         if (null == $wc_extra_fees) {
+        if ( ! $wc_extra_fees ) {
             $wc_extra_fees = 0;
+        }
         $wooss_rates_type = get_option('sendbox_data')['wooss_rates_type'];
         if (null == $wooss_rates_type) {
+        $wooss_rates_type = $sendbox_data['wooss_rates_type'];
+        if ( ! $wooss_rates_type ) {
             $wooss_rates_type = 'maximum';
+        }
         $wooss_rate_type = array("maximum", "minimum");
         $wooss_pickup_types = array('pickup', 'drop-off');
+        $wooss_rate_type = array( 'maximum', 'minimum' );
+        $wooss_pickup_types = array( 'pickup', 'drop-off' );
         $nigeria_states     = $api_call->get_nigeria_states();
-        //var_dump($wooss_display_fields);
         ?>
 …
         <!--Make changes and start using the new oauth--->
+            <!-- <strong><label for="wooss_basic_auth"><?php //esc_attr_e('API KEY :', 'wooss'); ?> </label><input type="text" class="wooss-text" placeholder="Basic X0000X0000000000AH" name="wooss_basic_auth" value="<?php //esc_attr_e($wooss_basic_auth, 'wooss'); ?>"></strong> <br /> -->
+            <div style="<?php esc_attr_e($custom_styles);?>">
+            <strong><label for="sendbox_auth_token"><?php esc_attr_e('Access Token :', 'wooss'); ?> </label><input type="text" class="wooss-text" placeholder="Enter Your Access Token" name="wooss[sendbox_auth_token]" value="<?php esc_attr_e($sendbox_auth_token, 'wooss'); ?>"></strong> <br />
+            <strong><label for="sendbox_refresh_token"><?php esc_attr_e('Refresh Token :', 'wooss'); ?> </label><input type="text" class="wooss-text" placeholder="Enter Your Refresh Token" name="wooss[sendbox_refresh_token]" value="<?php esc_attr_e($sendbox_refresh_token, 'wooss'); ?>"></strong> <br />
+            <strong><label for="sendbox_app_id"><?php esc_attr_e('App ID :', 'wooss'); ?> </label><input type="text" class="wooss-text" placeholder="Enter Your App ID" name="wooss[sendbox_app_id]" value="<?php esc_attr_e($sendbox_app_id, 'wooss'); ?>"></strong> <br />
+            <strong><label for="sendbox_client_secret"><?php esc_attr_e('Client Secret :', 'wooss'); ?> </label><input type="text" class="wooss-text" placeholder="Enter Your Client Secret" name="wooss[sendbox_client_secret]" value="<?php esc_attr_e($sendbox_client_secret, 'wooss'); ?>"></strong> <br />
+            <button type="submit" class="button-primary wooss-connect-sendbox wooss_fields"><?php esc_attr_e('Connect to Sendbox', 'wooss'); ?></button><br />
+            <div style="<?php esc_attr_e( $custom_styles ); ?>">
+                <strong><label for="sendbox_auth_token"><?php esc_attr_e( 'Access Token :', 'wooss' ); ?> </label><input type="text" class="wooss-text" placeholder="Enter Your Access Token" name="wooss[sendbox_auth_token]" value="<?php esc_attr_e( $sendbox_auth_token, 'wooss' ); ?>"></strong> <br />
+                <strong><label for="sendbox_refresh_token"><?php esc_attr_e( 'Refresh Token :', 'wooss' ); ?> </label><input type="text" class="wooss-text" placeholder="Enter Your Refresh Token" name="wooss[sendbox_refresh_token]" value="<?php esc_attr_e( $sendbox_refresh_token, 'wooss' ); ?>"></strong> <br />
+                <strong><label for="sendbox_app_id"><?php esc_attr_e( 'App ID :', 'wooss' ); ?> </label><input type="text" class="wooss-text" placeholder="Enter Your App ID" name="wooss[sendbox_app_id]" value="<?php esc_attr_e( $sendbox_app_id, 'wooss' ); ?>"></strong> <br />
+                <strong><label for="sendbox_client_secret"><?php esc_attr_e( 'Client Secret :', 'wooss' ); ?> </label><input type="text" class="wooss-text" placeholder="Enter Your Client Secret" name="wooss[sendbox_client_secret]" value="<?php esc_attr_e( $sendbox_client_secret, 'wooss' ); ?>"></strong> <br />
+                <button type="submit" class="button-primary wooss-connect-sendbox wooss_fields"><?php esc_attr_e( 'Connect to Sendbox', 'wooss' ); ?></button><br />
            </div>
+       <div class="wooss_necessary_fields" style="<?php  $display_fields = 'display : none'; if ($wooss_display_fields) {$display_fields = 'display : inline'; echo $display_fields;} else { echo $display_fields; }?>">
+       <div class="wooss_necessary_fields" style="
+            <?php
+                $display_fields = 'display : none';
+            if ( $wooss_display_fields && $sendbox_data ) {
+                $display_fields = 'display : inline';
+            }
+                echo $display_fields;
+            ?>
+        ">
                 <table style="width:100%">
                     <tr>
                         <td>
                             <strong><label for="wooss_username"><?php esc_attr_e('Name : ', 'wooss'); ?> </label></strong>
                         </td>
                         <td>
                             <input readonly type="text" class="wooss-text" placeholder="John Doe" name="wooss[wooss_username]" id="wooss_username" value="<?php esc_attr_e($wooss_username, 'wooss'); ?>" required>
                         </td>
                     </tr>
                     <tr>
                         <td>
                             <strong><label for="wooss_tel"><?php esc_attr_e('Phone Number : ', 'wooss'); ?> </label></strong>
                         </td>
                         <td>
                             <input readonly type="tel" class="wooss-text" placeholder="+2340000000000" id="wooss_tel" name="wooss[wooss_tel]" value="<?php esc_attr_e($wooss_tel, 'wooss'); ?>" required>
                         </td>
                     </tr>
                     <tr>
                         <td>
                             <strong><label for="wooss_email"><?php esc_attr_e('Email : ', 'wooss'); ?> </label></strong>
                         </td>
                         <td>
                             <input readonly type="email" class="wooss-text" placeholder="johndoe@gmail.com" id="wooss_email" name="wooss[wooss_email]" value="<?php esc_attr_e($wooss_email, 'wooss'); ?>" required>
                         </td>
                     </tr>
                     <tr>
                         <td>
                             <strong><label for="wooss_country"><?php esc_html_e('Country : ', 'wooss'); ?></label></strong>
+                            <strong><label for="wooss_username"><?php esc_attr_e( 'Name : ', 'wooss' ); ?> </label></strong>
+                        </td>
+                        <td>
+                            <input readonly type="text" class="wooss-text" placeholder="John Doe" name="wooss[wooss_username]" id="wooss_username" value="<?php esc_attr_e( $wooss_username, 'wooss' ); ?>" required>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <strong><label for="wooss_tel"><?php esc_attr_e( 'Phone Number : ', 'wooss' ); ?> </label></strong>
+                        </td>
+                        <td>
+                            <input readonly type="tel" class="wooss-text" placeholder="+2340000000000" id="wooss_tel" name="wooss[wooss_tel]" value="<?php esc_attr_e( $wooss_tel, 'wooss' ); ?>" required>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <strong><label for="wooss_email"><?php esc_attr_e( 'Email : ', 'wooss' ); ?> </label></strong>
+                        </td>
+                        <td>
+                            <input readonly type="email" class="wooss-text" placeholder="johndoe@gmail.com" id="wooss_email" name="wooss[wooss_email]" value="<?php esc_attr_e( $wooss_email, 'wooss' ); ?>" required>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <strong><label for="wooss_country"><?php esc_html_e( 'Country : ', 'wooss' ); ?></label></strong>
                         </td>
                         <td>
                             <select class="wooss_country_select wooss_selected">
                                 <option value="<?php esc_attr_e($wooss_country, 'wooss'); ?>" selected><?php esc_html_e($wooss_country, 'wooss'); ?></option>
+                                <option value="<?php esc_attr_e( $wooss_country, 'wooss' ); ?>" selected><?php esc_html_e( $wooss_country, 'wooss' ); ?></option>
                             </select>
                         </td>
 …
                     <tr>
                         <td>
+                            <strong><label for="wooss_city"><?php esc_attr_e('City : ', 'wooss'); ?></label></strong>
+                        </td>
+                        <td>
+                            <input type="text" class="wooss-text" name="wooss[wooss_city]" value="<?php echo esc_attr_e($wc_city); ?>">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <strong><label for="wooss_state"><?php esc_attr_e('State : ', 'wooss'); ?></label></strong>
+                        </td>
+                        <td>
+                            <strong><label for="wooss_city"><?php esc_attr_e( 'City : ', 'wooss' ); ?></label></strong>
+                        </td>
+                        <td>
+                            <input type="text" class="wooss-text" name="wooss[wooss_city]" value="<?php echo esc_attr_e( $wooss_city ); ?>">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <strong><label for="wooss_state"><?php esc_attr_e( 'State : ', 'wooss' ); ?></label></strong>
+                        </td>
+                        <td>
                             <?php
+                            echo "<select class='wooss_state_dropdown wooss_fields wooss_selected' name='wooss[wooss_state_dropdown]'>";
+                            foreach ($nigeria_states as $state) {
+                                $states_selected = (preg_match("/$wooss_states_selected/", $state) == true) ? 'selected="selected"' : '';
+                                echo "<option value='$state' $states_selected>$state</option>";
+                            $p_holder = '--Select State--';
+                            echo "<select class='wooss_state_name wooss_fields wooss_selected' name='wooss[wooss_state_name]'>";
+                            echo '<option value="no_state">' . $p_holder . '</option>';
+                            foreach ( $nigeria_states as $state ) {
+                                echo "<option value='$state'>$state</option>";
+                            }
                             echo '</select>';
                             ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <strong><label for="wooss_state"><?php esc_attr_e('Pickup types : ', 'wooss'); ?></label></strong>
+                            <script>
+                            jQuery(document).ready(function (){
+                                jQuery("select[name = 'wooss[wooss_state_name]']").val("<?php echo $wooss_states_selected; ?>");
+                            })
+                            </script>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <strong><label for="wooss_state"><?php esc_attr_e( 'Pickup types : ', 'wooss' ); ?></label></strong>
                         </td>
                         <td>
                             <?php
                             echo "<select class='wooss_pickup_type wooss_fields wooss_selected' name='wooss[wooss_pickup_type]'>";
                             foreach ($wooss_pickup_types as $pickup_types) {
                                 $types_selected = (preg_match("/$wooss_pickup_type/", $pickup_types) == true) ? 'selected="selected"' : '';
+                            foreach ( $wooss_pickup_types as $pickup_types ) {
+                                $types_selected = ( preg_match( "/$wooss_pickup_type/", $pickup_types ) == true ) ? 'selected="selected"' : '';
                                 echo "<option value='$pickup_types' $types_selected>$pickup_types</option>";
+                            }
 …
                     <tr>
                         <td>
                             <strong><label for="wooss_state"><?php esc_attr_e('Rates Type: ', 'wooss'); ?></label></strong>
+                            <strong><label for="wooss_state"><?php esc_attr_e( 'Rates Type: ', 'wooss' ); ?></label></strong>
                         </td>
                         <td>
 …
                             echo "<select class='wooss_rates_type wooss_fields wooss_selected' name='wooss[wooss_rates_type]'>";
                             foreach ($wooss_rate_type as $rates_type) {
                                 $types_selected = (preg_match("/$wooss_rates_type/", $rates_type) == true) ? 'selected="selected"' : '';
+                            foreach ( $wooss_rate_type as $rates_type ) {
+                                $types_selected = ( preg_match( "/$wooss_rates_type/", $rates_type ) == true ) ? 'selected="selected"' : '';
                                 echo "<option value='$rates_type' $types_selected>$rates_type</option>";
+                            }
 …
                     <tr>
                         <td>
                             <strong><label for="wooss_street"><?php esc_attr_e('Street : ', 'wooss'); ?></label></strong>
                         </td>
                         <td>
                             <input type="text" size="100" class="wooss-text" name="wooss[wooss_street]" value="<?php esc_attr_e($wc_store_address); ?>">
                         </td>
                     </tr>
                     <tr>
                         <td>
                             <strong><label for="wooss_extra_fees"><?php esc_attr_e('Extra fees : ', 'wooss'); ?></label></strong>
                         </td>
                         <td>
                             <input class="wooss-text" type="number" id="wooss_extra_fees" name="wooss[wooss_extra_fees]" value="<?php esc_attr_e($wc_extra_fees); ?>">
+                            <strong><label for="wooss_street"><?php esc_attr_e( 'Street : ', 'wooss' ); ?></label></strong>
+                        </td>
+                        <td>
+                            <input type="text" size="100" class="wooss-text" name="wooss[wooss_street]" value="<?php esc_attr_e( $wooss_store_address ); ?>">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <strong><label for="wooss_extra_fees"><?php esc_attr_e( 'Extra fees : ', 'wooss' ); ?></label></strong>
+                        </td>
+                        <td>
+                            <input class="wooss-text" type="number" id="wooss_extra_fees" name="wooss[wooss_extra_fees]" value="<?php esc_attr_e( $wc_extra_fees ); ?>">
                         </td>
                     </tr>
                 </table>
                 <button type="submit" class="button-primary wooss_save_button"><?php esc_attr_e('Sync changes', 'wooss'); ?></button>
+                <button type="submit" class="button-primary wooss_save_button wooss_sync_changes_btn"><?php esc_attr_e( 'Sync changes', 'wooss' ); ?></button>
             </div>
 …
             <span class="wooss_errors_pages wooss_fields"></span>
         </div>
     <?php
+        <?php
+    }
+}
 add_action('wp_ajax_connect_to_sendbox', 'connect_to_sendbox');
+add_action( 'wp_ajax_connect_to_sendbox', 'connect_to_sendbox' );
 /**
 …
  * @return void
  */
+function connect_to_sendbox()
+{
+    //var_dump($_POST);
+    $response_code    = 0;
+    if (isset($_POST['data'])) {
+        $data             = wp_unslash($_POST['data']);
+        //$wooss_basic_auth = $data['wooss_basic_auth'];
+function connect_to_sendbox() {
+    $response_code = 0;
+    //phpcs:disable
+    if ( isset( $_POST['data'] ) ) {
+        $data = wp_unslash( $_POST['data'] );
         $sendbox_auth_token = $data['sendbox_auth_token'];
-        //$sendbox_refresh_token = $data['sendbox_refresh_token'];
-        //$sendbox_client_secret = $data['sendbox_client_secret'];
-        //$sendbox_app_id = $data['sendbox_app_id'];
         $api_call               = new Wooss_Sendbox_Shipping_API();
         $api_url                = $api_call->get_sendbox_api_url('profile');
+        $api_url                = $api_call->get_sendbox_api_url( 'profile' );
         $args                   = array(
             'headers' => array(
+                'timeout'       => 30,
                 'Content-Type'  => 'application/json',
                 'Authorization' => $sendbox_auth_token,
-                //'Authorization' => $wooss_basic_auth,
             ),
         );
+        $response_code_from_api = $api_call->get_api_response_code($api_url, $args, 'GET');
+        //$response_body_from_profile_api = $api_call->get_api_response_body($api_url, $args, 'GET');
+        //var_dump($response_body_from_profile_api);
+        if (200 === $response_code_from_api) {
+        $response_code_from_api = $api_call->get_api_response_code( $api_url, $args, 'GET' );
+        if ( 200 === $response_code_from_api ) {
             $response_code = 1;
+            //update_option('wooss_connexion_status', $response_code);
+            update_option('wooss_connection_status', $response_code);
+            update_option('sendbox_data', $data);
+            //update_option('wooss_basic_auth', $wooss_basic_auth);
+            //update_option('sendbox_auth_token', $sendbox_auth_token);
+            //update_option('sendbox_refresh_token', $sendbox_refresh_token);
+            //update_option('sendbox_app_id', $sendbox_app_id);
+            //update_option('sendbox_client_secret', $sendbox_client_secret);
+        }
+    }
+    esc_attr_e($response_code);
+            update_option( 'wooss_connection_status', $response_code );
+            update_option( 'sendbox_data', $data );
+        }
+    }
+    esc_attr_e( $response_code );
     wp_die();
+}
 add_action('wp_ajax_save_fields_by_ajax', 'save_fields_by_ajax');
+add_action( 'wp_ajax_save_fields_by_ajax', 'save_fields_by_ajax' );
 /**
  * Function  for saving fields into db using ajax.
 …
  * @return mixed $string
  */
+function save_fields_by_ajax()
+{
+function save_fields_by_ajax() {
     $operation_success = 0;
+    if (isset($_POST['data']) &&  wp_verify_nonce($_POST['security'], 'wooss-ajax-security-nonce')) {
+        $data              =  wp_unslash($_POST['data']);
+        $sendbox_data      =  get_option("sendbox_data");
+        $new_sendbox_data =    array_merge($sendbox_data, $data);
+        update_option('sendbox_data', $new_sendbox_data);
+     }
+    esc_attr_e($operation_success);
+    //phpcs:disable
+    if ( isset( $_POST['data'] ) && wp_verify_nonce( $_POST['security'], 'wooss-ajax-security-nonce' ) ) {
+        $data             = wp_unslash( $_POST['data'] );
+        $sendbox_data     = get_option( 'sendbox_data' );
+        $new_sendbox_data = array_merge( $sendbox_data, $data );
+        update_option( 'sendbox_data', $new_sendbox_data );
+        $operation_success = 1;
+    }
+    esc_attr_e( $operation_success );
     wp_die();
+}
-/* add_filter( 'woocommerce_thankyou', 'woosb_update_order_status', 10, 1 );
-function woosb_update_order_status( $order_id ) {
-  if ( !$order_id ){
-    return;
+  }
-  $order = new WC_Order( $order_id );
-  if ( 'processing' == $order->get_status() ) {
-      if (!current_user_can('administrator')){
-        $order->update_status( 'on-hold' );
+      }
+  }
-  return $order_id;
+}
- */
-function action_wooss_checkout_update_order_review($array, $int){
-     //DO SOMETHING HERE???
-     WC()->cart->calculate_shipping();
-    return;
+}
-//add_action('woocommerce_checkout_update_order_review','action_wooss_checkout_update_order_review', 10, 2);
 /**
  *  This function get the shipping fees from SendBox.
+ *  This function get the shipping fees from SendBox.
+ *
  * @return object|array
  */
 function wooss_calculate_shipping($api_obj,$payload_array_data,$authorization_key){
     $payload_data                        = new stdClass();
     foreach($payload_array_data as $key => $value){
         switch($key){
+function wooss_calculate_shipping( $api_obj, $payload_array_data, $authorization_key ) {
+    $payload_data = new stdClass();
+    foreach ( $payload_array_data as $key => $value ) {
+        switch ( $key ) {
             case 'destination_name':
                 $payload_data->destination_name      = $value;
             break;
+                $payload_data->destination_name = $value;
+                break;
             case 'destination_country':
                 $payload_data->destination_country       = $value;
             break;
             case 'destination_state' :
                 $payload_data->destination_state     = $value;
             break;
+                $payload_data->destination_country = $value;
+                break;
+            case 'destination_state':
+                $payload_data->destination_state = $value;
+                break;
             case 'destination_city':
                 $payload_data->destination_city     = $value;
             break;
+                $payload_data->destination_city = $value;
+                break;
             case 'destination_street':
                 $payload_data->destination_street     = $value;
             break;
+                $payload_data->destination_street = $value;
+                break;
             case 'destination_phone':
+                $payload_data->destination_phone     = $value;
+            break;
+        /*  case 'items_list':
+                $payload_data->items     = $value;
+            break; */
+                $payload_data->destination_phone = $value;
+                break;
             case 'weight':
+                $payload_data->weight     = $value;
+            break;
+/*
+            case 'amount_to_receive':
+                $payload_data->amount_to_receive     = $value;
+            break; */
+                $payload_data->weight = $value;
+                break;
             case 'origin_country':
                 $payload_data->origin_country     = $value;
             break;
+                $payload_data->origin_country = $value;
+                break;
             case 'origin_state':
                 $payload_data->origin_state     = $value;
             break;
+                $payload_data->origin_state = $value;
+                break;
             case 'origin_name':
+                $payload_data->origin_name     = $value;
+            break;
+                $payload_data->origin_name = $value;
+                break;
             case 'origin_phone':
                 $payload_data->origin_phone     = $value;
             break;
+                $payload_data->origin_phone = $value;
+                break;
             case 'origin_street':
                 $payload_data->origin_street     = $value;
             break;
+                $payload_data->origin_street = $value;
+                break;
             case 'origin_city':
+                $payload_data->origin_city     = $value;
+            break;
+        /*  case 'deliver_priority_code':
+                $payload_data->deliver_priority_code     = $value;
+            break;
+            case 'pickup_date':
+                $payload_data->pickup_date     = $value;
+            break;
+            case 'incoming_option_code':
+                $payload_data->incoming_option_code     = $value;
+            break;
+            case 'payment_option_code':
+                $payload_data->payment_option_code     = $value;
+            break;
+            case 'deliver_type_code':
+                $payload_data->deliver_type_code     = $value;
+            break; */
+                $payload_data->origin_city = $value;
+                break;
             default:
+            break;
+        }
+    }
+    $payload_data_json = json_encode($payload_data);
+                break;
+        }
+    }
+    $payload_data_json = json_encode( $payload_data );
     $delivery_args = array(
+        'timeout' => 30,
         'headers' => array(
             'Content-Type'  => 'application/json',
 …
         ),
         'body'    => $payload_data_json,
+    );
+    //var_dump($delivery_args);
+    $delivery_quotes_url = $api_obj->get_sendbox_api_url('delivery_quote');
+    $delivery_quotes_details = $api_obj->get_api_response_body($delivery_quotes_url, $delivery_args, 'POST');
+    //var_dump($delivery_quotes_details);
+    );
+    $delivery_quotes_url     = $api_obj->get_sendbox_api_url( 'delivery_quote' );
+    $delivery_quotes_details = $api_obj->get_api_response_body( $delivery_quotes_url, $delivery_args, 'POST' );
     return $delivery_quotes_details;
+}
 /**
  * This function is for getting countries or state name.
+ *
  * @param array $package
+ * This function is for getting countries or state name.
+ *
+ * @param array  $package
  * @param string $type
  * @return string
  */
 function wooss_get_countries($package,$type){
+function wooss_get_countries( $package, $type ) {
     $countries_obj       = new WC_Countries();
     $destination_states  = $countries_obj->get_states($package['destination']['country']);
     $destination_country = $countries_obj->get_shipping_countries($package['destination']['country']);
     $delivery_state = "";
     if (empty($destination_states)) {
         $destination_states = array('');
+    }
     if (empty($destination_country)) {
         $destination_country = array('');
+    }
     if('state' == $type){
         foreach ($destination_states as $states_code => $states_name) {
             if ($package['destination']['state'] === $states_code) {
+    $destination_states  = $countries_obj->get_states( $package['destination']['country'] );
+    $destination_country = $countries_obj->get_shipping_countries( $package['destination']['country'] );
+    $delivery_state      = '';
+    if ( empty( $destination_states ) ) {
+        $destination_states = array( '' );
+    }
+    if ( empty( $destination_country ) ) {
+        $destination_country = array( '' );
+    }
+    if ( 'state' == $type ) {
+        foreach ( $destination_states as $states_code => $states_name ) {
+            if ( $package['destination']['state'] === $states_code ) {
                 $delivery_state = $states_name;
                 break;
+            }
+        }
     }elseif('country' == $type){
         foreach ($destination_country as $destination_country_code => $country_name) {
             if ($package['destination']['country'] === $destination_country_code) {
+    } elseif ( 'country' == $type ) {
+        foreach ( $destination_country as $destination_country_code => $country_name ) {
+            if ( $package['destination']['country'] === $destination_country_code ) {
                 $delivery_state = $country_name;
                 break;
 …
+    }
     return $delivery_state;
+}

sendbox-shipping/trunk/public/class-wooss-public.php

-                      r2127526
+                      r2488399
      */
     public function add_extra_fees_to_order( $order_id ) {
         $wooss_extra_fees = get_option( 'wooss_extra_fees' );
+        $sendbox_data = get_option('sendbox_data');
+        $wooss_extra_fees = $sendbox_data[ 'wooss_extra_fees' ];
         update_post_meta( $order_id, 'wooss_extra_fees', 'Your additionnal fees is : ' . $wooss_extra_fees . get_woocommerce_currency() );
+    }

sendbox-shipping/trunk/wooss.php

-                      r2430838
+                      r2488399
  * Plugin URI:        #
  * Description:       This is a woocommerce plugin that enables you ship from your store in Nigeria to anywhere in the world.
  * Version:           3.2.2
+ * Version:           3.3.0
  * Author:            sendbox
  * Author URI:        https://sendbox.ng/
 …
  * Rename this for your plugin and update it as you release new versions.
  */
 define('WOOSS_VERSION', '3.2.2');
+define('WOOSS_VERSION', '3.3.0');
 /**

Note: See TracChangeset for help on using the changeset viewer.

Trac UI Preferences

Plugin Directory