Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3255662

Timestamp:

03/14/2025 03:15:17 AM (13 months ago)

Author:

sendbox

Message:

update

Location:

sendbox-shipping

Files:

: 46 added
: 5 edited

tags/5.2 (added)
tags/5.2/LICENSE.txt (added)
tags/5.2/README.md (added)
tags/5.2/README.txt (added)
tags/5.2/admin (added)
tags/5.2/admin/class-wooss-admin.php (added)
tags/5.2/admin/css (added)
tags/5.2/admin/css/wooss-admin.css (added)
tags/5.2/admin/images (added)
tags/5.2/admin/images/loader.gif (added)
tags/5.2/admin/index.php (added)
tags/5.2/admin/js (added)
tags/5.2/admin/js/wooss-admin.js (added)
tags/5.2/admin/partials (added)
tags/5.2/admin/partials/wooss-admin-display.php (added)
tags/5.2/includes (added)
tags/5.2/includes/assets (added)
tags/5.2/includes/assets/css (added)
tags/5.2/includes/assets/css/styles.css (added)
tags/5.2/includes/assets/js (added)
tags/5.2/includes/assets/js/jqueryserilize.js (added)
tags/5.2/includes/assets/js/script.js (added)
tags/5.2/includes/class-wooss-activator.php (added)
tags/5.2/includes/class-wooss-deactivator.php (added)
tags/5.2/includes/class-wooss-i18n.php (added)
tags/5.2/includes/class-wooss-loader.php (added)
tags/5.2/includes/class-wooss-sendbox-shipping-api.php (added)
tags/5.2/includes/class-wooss-shipping-method.php (added)
tags/5.2/includes/class-wooss.php (added)
tags/5.2/includes/index.php (added)
tags/5.2/index.php (added)
tags/5.2/languages (added)
tags/5.2/languages/wooss-en_US.mo (added)
tags/5.2/languages/wooss-en_US.po (added)
tags/5.2/languages/wooss.pot (added)
tags/5.2/public (added)
tags/5.2/public/class-wooss-public.php (added)
tags/5.2/public/css (added)
tags/5.2/public/css/wooss-public.css (added)
tags/5.2/public/index.php (added)
tags/5.2/public/js (added)
tags/5.2/public/js/wooss-public.js (added)
tags/5.2/public/partials (added)
tags/5.2/public/partials/wooss-public-display.php (added)
tags/5.2/uninstall.php (added)
tags/5.2/wooss.php (added)
trunk/README.txt (modified) (1 diff)
trunk/admin/class-wooss-admin.php (modified) (5 diffs)
trunk/admin/js/wooss-admin.js (modified) (2 diffs)
trunk/includes/class-wooss-shipping-method.php (modified) (1 diff)
trunk/wooss.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

sendbox-shipping/trunk/README.txt

r3255617	r3255662
5	5	Requires at least: 6.5.4
6	6	Tested up to: 6.7
7		Stable tag: 5.1
	7	Stable tag: 5.2
8	8	Requires PHP: 8.0
9	9	License: GPLv2 or later

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

-                      r2776138
+                      r3255662
     //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 ( ! is_admin() ) {
+            return;
+        }
+        if ( isset( $_GET['post'] ) ) {
+            $order_id = absint( $_GET['post'] );
+        } elseif ( isset( $_GET['id'] ) ) {
+            $order_id = absint( $_GET['id'] );
+        } else {
+            return;
+        }
+        if ( 'shop_order_placehold' !== get_post_type( $order_id ) ) {
+            return;
+        }
+        // Get the order and check shipping method(s)
+        $_order = wc_get_order( $order_id );
+        if ( ! $_order ) {
+            return;
+        }
+        $method_id = '';
+        foreach ( $_order->get_items( 'shipping' ) as $item_id => $shipping_item_obj ) {
+            $method_id .= $shipping_item_obj->get_method_id();
+        }
+        // If the shipping method is 'wooss', add the metabox
+            add_meta_box(
+                'wooss_ship_sendbox',
+                __( 'Ship with Sendbox' ),
+                array( $this, 'field_for_request_shipments' ),
+                get_current_screen()->id,
+                'side',
+                'high'
+            );
+    }
+    public function field_for_request_shipments( $order ) {
+        // Use the proper getter to retrieve the order ID.
+        $order_id = $order->get_id();
+        // Only proceed if the post type is shop_order and shipping is enabled.
+        if ( 'shop_order_placehold' !== get_post_type( $order_id ) || get_option('wooss_option_enable') === "no" ) {
+            return;
+        }
+        // $order is already a WC_Order object so no need to call wc_get_order() again.
+        // Get destination (customer) details.
+        $destination_name    = $order->get_formatted_billing_full_name();
+        $destination_phone   = $order->get_billing_phone();
+        $destination_street  = $order->get_billing_address_1();
+        $destination_city    = $order->get_billing_city();
+        $destination_state   = $order->get_billing_state();
+        $destination_country = $order->get_billing_country();
+        $destination_email   = $order->get_billing_email();
+        // Use WC_Countries to resolve state name.
+        $countries_obj = new WC_Countries();
+        $states = $countries_obj->get_states( $destination_country );
+        if ( empty( $destination_state ) ) {
+            $destination_state = $destination_city;
+        }
+        if ( stripos( $destination_state, 'FC' ) !== false && ( $destination_country === 'NG' || stripos( $destination_country, 'nigeria' ) !== false ) ) {
+            $destination_state = 'abuja';
+        }
+        // Build items list.
+        $items_lists    = array();
+        $total_fee      = 0;
+        $total_quantity = 0;
+        foreach ( $order->get_items() as $item ) {
+            $product = $item->get_product();
+            if ( ! $product ) {
+                continue;
+            }
+            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;
+        $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();
+            $destination_street  = $_order->get_billing_address_1();
+            $destination_city    = $_order->get_billing_city();
+            $destination_state   = $_order->get_billing_state();
+            $destination_country = $_order->get_billing_country();
+            $destination_email   = $_order->get_billing_email();
+            $countries_obj = new WC_Countries();
+            $states = $countries_obj->get_states( $destination_country );
+            foreach ( $states as $state_code => $state_name ) {
+                if ( $destination_state == $state_code ) {
+                    $destination_state = $state_name;
+                    break;
+            $item_data = new stdClass();
+            $item_data->name              = $item->get_name();
+            $item_data->quantity          = $item->get_quantity();
+            $item_data->value             = $product->get_price();
+            $item_data->amount_to_receive = $product->get_price();
+            $item_data->package_size_code = 'medium';
+            $item_data->item_type_code    = 'other';
+            $weight = $product->get_weight() ? $product->get_weight() : 0;
+            // Multiply weight by quantity.
+            $item_data->weight = $weight * $item->get_quantity();
+            $total_fee      += round( $product->get_price() );
+            $total_quantity += $item->get_quantity();
+            $items_lists[] = $item_data;
+        }
+        // Prepare API call to get origin (store) details.
+        $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',
+                'Authorization' => $auth_header,
+            ),
+        );
+        $profile_api_url = 'https://live.sendbox.co/oauth/profile';
+        $profile_code    = $api_call->get_api_response_code( $profile_api_url, $args, 'GET' );
+        $profile_body    = $api_call->get_api_response_body( $profile_api_url, $args, 'GET' );
+        $wooss_origin_name  = '';
+        $wooss_origin_email = '';
+        $wooss_origin_phone = '';
+        $country_code_default = '';
+        if ( $profile_code == 200 && ! empty( $profile_body ) ) {
+            $wooss_origin_name  = $profile_body->name;
+            $wooss_origin_email = $profile_body->email;
+            $wooss_origin_phone = $profile_body->phone;
+            $country_code_default = isset( $profile_body->country->code ) ? $profile_body->country->code : '';
+        }
+        // Get store (origin) details.
+        $wc_city          = get_option( 'woocommerce_store_city' );
+        $wc_store_address = get_option( 'woocommerce_store_address' );
+        $wooss_origin_city   = ! empty( $sendbox_data['wooss_city'] ) ? $sendbox_data['wooss_city'] : $wc_city;
+        $wooss_origin_street = ! empty( $sendbox_data['wooss_street'] ) ? $sendbox_data['wooss_street'] : $wc_store_address;
+        $wooss_origin_states = ! empty( $sendbox_data['wooss_state_name'] ) ? $sendbox_data['wooss_state_name'] : '';
+        $wooss_origin_country = ! empty( $sendbox_data['wooss_country'] ) ? $sendbox_data['wooss_country'] : '';
+        $wooss_pickup_type    = ! empty( $sendbox_data['wooss_pickup_type'] ) ? $sendbox_data['wooss_pickup_type'] : 'pickup';
+        $incoming_option_code = $wooss_pickup_type;
+        if ( empty( $incoming_option_code ) ) {
+            return;
+        }
+        // Set pickup date to tomorrow.
+        $date        = new DateTime();
+        $date->modify( '+1 day' );
+        $pickup_date = $date->format( DateTime::ATOM );
+        // Confirm the shipping method for this order is 'wooss'.
+        $method_id = '';
+        foreach ( $order->get_items( 'shipping' ) as $shipping_item ) {
+            $method_id .= $shipping_item->get_method_id();
+        }
+        if ( $method_id !== 'wooss' ) {
+            return;
+        }
+        // Build the payload for the delivery quote API.
+        $payload_data = new stdClass();
+        $payload_data->origin_name             = $wooss_origin_name;
+        $payload_data->destination_country_code = $destination_country;
+        $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                  = $total_quantity * $weight;
+        $payload_data->amount_to_receive       = $total_fee;
+        $payload_data->origin_country          = $wooss_origin_country;
+        $payload_data->origin_state            = $wooss_origin_states;
+        $payload_data->origin_phone            = $wooss_origin_phone;
+        $payload_data->origin_street           = $wc_store_address;
+        $payload_data->origin_city             = $wooss_origin_city;
+        $payload_data->pickup_date             = $pickup_date;
+        $payload_data->incoming_option_code    = $incoming_option_code;
+        $payload_data->payment_option_code     = 'prepaid';
+        $payload_json = wp_json_encode( $payload_data );
+        $delivery_args = array(
+            'timeout' => 30,
+            'headers' => array(
+                'Content-Type'  => 'application/json',
+                'Authorization' => $auth_header,
+            ),
+            'body'    => $payload_json,
+        );
+        // Get shipping quote.
+        $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' );
+        $quotes_rates  = isset( $quote_body->rates ) ? $quote_body->rates : array();
+        $wallet        = isset( $quote_body->wallet_balance ) ? $quote_body->wallet_balance : '';
+        // Build a JSON string for the items if needed.
+        $product_content = '';
+        foreach ( $items_lists as $item ) {
+            $product_content .= sprintf(
+                '{"name": "%s", "quantity": "%s", "value": "%s", "amount_to_receive": "%s", "package_size_code": "%s", "item_type": "%s", "weight": "%s"}',
+                esc_js( $item->name ),
+                esc_js( $item->quantity ),
+                esc_js( $item->value ),
+                esc_js( $item->amount_to_receive ),
+                esc_js( $item->package_size_code ),
+                esc_js( $item->item_type_code ),
+                esc_js( $item->weight )
+            );
+        }
+        // Fetch countries for the dropdowns.
+        unset( $args['headers']['Authorization'] );
+        $countries_api_url = add_query_arg( 'page_by', '{"per_page":264}', 'https://api.sendbox.co/auth/countries' );
+        $countries_response = wp_remote_get( $countries_api_url, $args );
+        $countries_body     = json_decode( wp_remote_retrieve_body( $countries_response ) );
+        $countries = ( isset( $countries_body->results ) && is_array( $countries_body->results ) ) ? $countries_body->results : array();
+        // Optionally sort countries alphabetically.
+        usort( $countries, function( $a, $b ) {
+            return strcmp( $a->name, $b->name );
+        });
+        // Use output buffering to render the HTML.
+        ob_start();
+        ?>
+        <div id="wooss_shipments_data">
+            <!-- Hidden JSON Payload -->
+            <textarea id="wooss_payload_data" name="wooss_payload_data" style="display:none;"><?php echo esc_textarea( $payload_json ); ?></textarea>
+            <!-- Inline CSS for styling -->
+            <style>
+                /* Ensure fieldsets are spaced and remove default borders */
+                #wooss_shipments_data fieldset {
+                    border: none;
+                    margin: 0;
+                    padding: 0;
+                }
+            }
+            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;
+                /* Make the legend bold and a bit larger */
+                #wooss_shipments_data legend {
+                    font-weight: bold;
+                    font-size: 1.2em;
+                    margin-bottom: 10px;
+                }
+            }
+            $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;
+                /* Style for the dashed separator line */
+                .separator {
+                    border: 0;
+                    border-bottom: 1px dashed #ccc;
+                    margin: 20px 0;
+                }
+                $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                = Wooss_Sendbox_Shipping_API::checkAuth();
+            $sendbox_data               = get_option('sendbox_data');
+            $args                       = array(
+                'timeout' => 30,
+                'headers' => array(
+                    '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' );
+            $wooss_origin_name          = '';
+            $wooss_origin_email         = '';
+            $wooss_origin_phone         = '';
+            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;
+                //MAKEING CHANGES HERE
+                $country_code_default = $profile_data_response_body->country->code;
+            }
+            $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 ( ! $wooss_origin_street ) {
+                $wooss_origin_street = $wc_store_address;
+            }
+            $wooss_origin_states_selected = $sendbox_data['wooss_state_name'];
+            if ( ! $wooss_origin_states_selected ) {
+                $wooss_origin_states_selected = '';
+            }
+            $wooss_origin_country = $sendbox_data[ 'wooss_country' ];
+            /* if ( ! $wooss_origin_country ) {
+                $wooss_origin_country = 'Nigeria';
+            } */
+            $wooss_pickup_type = $sendbox_data['wooss_pickup_type'];
+            if ( ! $wooss_pickup_type ) {
+                $wooss_pickup_type = 'pickup';
+            }
+            $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 ) {
+                $method_id .= $shipping_item_obj->get_method_id();
+            }
+            if ( $method_id == 'wooss' ) {
+                /* Optional: Bold the labels in form groups */
+                .form-group label {
+                    font-weight: bold;
+                    display: block;
+                    margin-bottom: 5px;
+                }
+                /* Ensure inputs take full width */
+                .wooss-text, .custom_input {
+                    width: 100%;
+                    box-sizing: border-box;
+                }
+            </style>
+            <!-- Editable Origin Details -->
+            <fieldset>
+                <legend><?php esc_html_e( 'Origin Details', 'wooss' ); ?></legend>
+                <div class="form-group" style="margin-bottom:10px;">
+                    <label for="wooss_origin_name"><?php esc_html_e( 'Name:', 'wooss' ); ?></label>
+                    <input type="text" id="wooss_origin_name" name="wooss_origin_name" class="wooss-text" value="<?php echo esc_attr( $wooss_origin_name ); ?>">
+                </div>
+                <div class="form-group" style="margin-bottom:10px;">
+                    <label for="wooss_origin_phone"><?php esc_html_e( 'Phone:', 'wooss' ); ?></label>
+                    <input type="text" id="wooss_origin_phone" name="wooss_origin_phone" class="wooss-text" value="<?php echo esc_attr( $wooss_origin_phone ); ?>">
+                </div>
+                <div class="form-group" style="margin-bottom:10px;">
+                    <label for="wooss_origin_street"><?php esc_html_e( 'Street:', 'wooss' ); ?></label>
+                    <input type="text" id="wooss_origin_street" name="wooss_origin_street" class="wooss-text" value="<?php echo esc_attr( $wc_store_address ); ?>">
+                </div>
+                <div class="form-group" style="margin-bottom:10px;">
+                    <label for="wooss_origin_state"><?php esc_html_e( 'State:', 'wooss' ); ?></label>
+                    <input type="text" id="wooss_origin_state" name="wooss_origin_state" class="wooss-text" value="<?php echo esc_attr( $wooss_origin_states ); ?>">
+                </div>
+                <div class="form-group" style="margin-bottom:10px;">
+                    <label for="wooss_origin_country"><?php esc_html_e( 'Country:', 'wooss' ); ?></label>
+                    <select id="wooss_origin_country" name="wooss_origin_country" class="custom_input">
+                        <option data-country-code="default" value=""><?php _e( 'Please select origin country', 'wooss' ); ?></option>
+                        <?php foreach ( $countries as $country_item ) : ?>
+                            <option data-country-code="<?php echo esc_attr( $country_item->code ); ?>" value="<?php echo esc_attr( $country_item->name ); ?>" <?php selected( $wooss_origin_country, $country_item->name ); ?>>
+                                <?php echo esc_html( $country_item->name ); ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                <div class="form-group" style="margin-bottom:10px;">
+                    <label for="wooss_origin_city"><?php esc_html_e( 'City:', 'wooss' ); ?></label>
+                    <input type="text" id="wooss_origin_city" name="wooss_origin_city" class="wooss-text" value="<?php echo esc_attr( $wooss_origin_city ); ?>">
+                </div>
+            </fieldset>
+            <!-- Dashed separator -->
+            <hr class="separator">
+<!-- Destination Details (Read-Only) -->
+<fieldset>
+    <legend><?php esc_html_e( 'Destination Details', 'wooss' ); ?></legend>
+    <div class="form-group" style="margin-bottom:10px;">
+        <label for="wooss_destination_name"><?php esc_html_e( 'Name:', 'wooss' ); ?></label>
+        <input type="text" id="wooss_destination_name" name="wooss_destination_name" class="wooss-text" value="<?php echo esc_attr( $destination_name ); ?>" readonly>
+    </div>
+    <div class="form-group" style="margin-bottom:10px;">
+        <label for="wooss_destination_phone"><?php esc_html_e( 'Phone:', 'wooss' ); ?></label>
+        <input type="text" id="wooss_destination_phone" name="wooss_destination_phone" class="wooss-text" value="<?php echo esc_attr( $destination_phone ); ?>" readonly>
+    </div>
+    <div class="form-group" style="margin-bottom:10px;">
+        <label for="wooss_destination_street"><?php esc_html_e( 'Street:', 'wooss' ); ?></label>
+        <input type="text" id="wooss_destination_street" name="wooss_destination_street" class="wooss-text" value="<?php echo esc_attr( $destination_street ); ?>" readonly>
+    </div>
+    <div class="form-group" style="margin-bottom:10px;">
+        <label for="wooss_destination_state"><?php esc_html_e( 'State:', 'wooss' ); ?></label>
+        <input type="text" id="wooss_destination_state" name="wooss_destination_state" class="wooss-text" value="<?php echo esc_attr( $destination_state ); ?>" readonly>
+    </div>
+    <div class="form-group" style="margin-bottom:10px;">
+    <label for="wooss_destination_country"><?php esc_html_e( 'Country:', 'wooss' ); ?></label>
+    <select id="wooss_destination_country" name="wooss_destination_country" class="custom_input" disabled>
+        <option data-country-code="default" value=""><?php echo esc_html( $destination_country ); ?></option>
+    </select>    </div>
+    <div class="form-group" style="margin-bottom:10px;">
+        <label for="wooss_destination_city"><?php esc_html_e( 'City:', 'wooss' ); ?></label>
+        <input type="text" id="wooss_destination_city" name="wooss_destination_city" class="wooss-text" value="<?php echo esc_attr( $destination_city ); ?>" readonly>
+    </div>
+    <div class="form-group" style="margin-bottom:10px;">
+        <label for="wooss_destination_email"><?php esc_html_e( 'Email:', 'wooss' ); ?></label>
+        <input type="text" id="wooss_destination_email" name="wooss_destination_email" class="wooss-text" value="<?php echo esc_attr( $destination_email ); ?>" readonly>
+    </div>
+</fieldset>
+<!-- Dashed separator -->
+<hr class="separator">
+<!-- Shipment Details (Weight Read-Only) -->
+<fieldset>
+    <legend><?php esc_html_e( 'Shipment Details', 'wooss' ); ?></legend>
+    <div class="form-group" style="margin-bottom:10px;">
+        <label for="wooss_weight"><?php esc_html_e( 'Weight:', 'wooss' ); ?></label>
+        <input type="text" id="wooss_weight" name="wooss_weight" class="wooss-text" value="<?php echo esc_attr( $weight ); ?>" readonly>
+    </div>
+    <div class="form-group" style="margin-bottom:10px;">
+        <label for="wooss_incoming_option_code"><?php esc_html_e( 'Incoming Option Code:', 'wooss' ); ?></label>
+        <input type="text" id="wooss_incoming_option_code" name="wooss_incoming_option_code" class="wooss-text" value="<?php echo esc_attr( $incoming_option_code ); ?>">
+    </div>
+</fieldset>
+            <!-- Dashed separator -->
+            <hr class="separator">
+            <!-- Wallet Balance and Courier Selection -->
+            <div class="wooss-wallet-courier" style="margin-bottom:20px;">
+                <div style="margin-bottom:10px;">
+                    <strong><?php esc_html_e( 'WALLET BALANCE', 'wooss' ); ?>:</strong>
+                    <span><?php echo esc_html( $quote_body->rates[0]->currency . $wallet ); ?></span>
+                </div>
+                <div class="form-group" style="margin-bottom:10px;">
+                    <label for="wooss_selected_courier"><?php esc_html_e( 'Select Courier:', 'wooss' ); ?></label>
+                    <select id="wooss_selected_courier" name="wooss_selected_courier">
+                        <option value=""><?php esc_html_e( 'Select a courier...', 'wooss' ); ?></option>
+                        <?php foreach ( $quotes_rates as $rate ) : ?>
+                            <option data-courier-price="<?php echo esc_attr( $rate->fee ); ?>" value="<?php echo esc_attr( $rate->service_code ); ?>" id="<?php echo esc_attr( $rate->courier_id ); ?>">
+                                <?php echo esc_html( $rate->name ); ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+            <div style="display:flex; justify-content:space-between; align-items:center;">
+                <b id="dabs"><?php /* Optionally display fee here */ ?></b>
+                </div>
+            <!-- Extra Field: Postal Code and Request Shipment Button -->
+            <div class="wooss-extra-fields" style="margin-top:20px;">
+                <?php
+                $postal_code = $order->get_billing_postcode();
+                if ( ! empty( $postal_code ) ) {
+                    echo '<div class="form-group" style="margin-bottom:10px;">';
+                    echo '<label for="wooss_postal_code">' . esc_html__( 'Postal Code:', 'wooss' ) . '</label>';
+                    echo "<input id='wooss_postal_code' type='text' value='" . esc_attr( $postal_code ) . "' placeholder='" . esc_attr__( 'Enter Postal Code', 'wooss' ) . "'>";
+                    echo '</div>';
+                }
                 ?>
+                <div  id="wooss_shipments_data">
+                    <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>
+                        &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>
+                        <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>
+                        &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>
+                        <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>
+                        &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>
+                        &nbsp
+                        <br />&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>
+                    </span>
+                    <br />
+                    <br />
+                    <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>
+                        &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>
+                        <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>
+                        &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>
+                        <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>
+                        &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>
+                        <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>
+                    <?php
+                    $product_content = '';
+                    foreach ( $items_lists as $lists_id => $list_data ) {
+                        $product_name              = $list_data->name;
+                        $product_quantity          = $list_data->quantity;
+                        $product_value             = $list_data->value;
+                        $product_amount            = $list_data->amount_to_receive;
+                        $product_package_size_code = $list_data->package_size_code;
+                        $product_item_type_code    = $list_data->item_type_code;
+                        $product_weights           = $list_data->weight;
+                        $product_content          .= '{"name" : "' . $product_name . '", "quantity" :"' . $product_quantity . '", "value" :"' . $product_value . '", "amount_to_receive" :"' . $product_amount . '", "package_size_code":"' . $product_package_size_code . '", "item_type":"' . $product_item_type_code . '"," weight" :"' . $product_weights . '"}';
+                    }
+                    // loading the payload
+                    $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 );
+                    $delivery_args     = array(
+                        'timeout' => 30,
+                        'headers' => array(
+                            'Content-Type'  => 'application/json',
+                            'Authorization' => $auth_header,
+                        ),
+                        'body'    => $payload_data_json,
+                    );
+                    // print_r($payload_data_json);
+                    ?>
+                </div>
+                <span>
+                    <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>
+                        <?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);
+                        $quotes_rates = $quote_body->rates;
+                        //var_dump($quotes_rates);
+                        // print_r($quote_body);
+                        $wallet = $quote_body->wallet_balance;
+                        foreach ( $quotes_rates as $rates_id => $rates_values ) {
+                            $rates_names = $rates_values->name;
+                            $rates_fee   = $rates_values->fee;
+                            $rates_id    = $rates_values->id;
+                            $currency = $rates_values->currency;
+                             //print_r($rates_values);
+                        }
+                        ?>
+                        <span id="wooss_shipments_data">
+                            <div style="text-align : left; display: flex; flex-direction: row; justify-content: space-between; align-items: center;">
+                                <b>
+                                    <?php
+                                    esc_attr_e( 'WALLET BALANCE' );
+                                    ?>
+                                </b>
+                                <b>
+                                    <?php
+                                    esc_attr_e( $currency . $wallet );
+                                    ?>
+                                </b>
+                            </div>
+                        <select id="wooss_selected_courier" >
+                                <option value=""> <?php esc_attr_e( 'Select a courier... ' ); ?> </option>
+                                <?php
+                                foreach ( $quotes_rates as $rates_id => $rates_values ) {
+                                    $rates_names = $rates_values->name;
+                                    $rates_fee   = $rates_values->fee;
+                                    $rates_id    = $rates_values->courier_id;
+                                    $currency = $rates_values->currency;
+                                    ?>
+                                    <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
+                                }
+                                ?>
+                            </select>
+                            <?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 ) );
+                            ?>
+                             <label><h4><b>ORIGIN NAME</b></h4></label>
+                              <input class ="custom_input" required type="text" name="origin_name" placeholder="<?php esc_attr_e("Please Enter Origin Name")?>" id="origin_name" value=" " />
+                              <label><h4><b>ORIGIN PHONE</b></h4></label>
+                             <input class ="custom_input" required type="tel" name="origin_phone" placeholder="<?php esc_attr_e("Please Enter Origin Phone")?>" id="origin_phone" value=" " />
+                                <label><h4><b>ORIGIN COUNTRY</b></h4></label>
+                                <select class ="custom_input" id = "wooss_origin_country">
+                                <option data-country-code="default" value="">
+                                <?php _e( 'Please select origin 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>
+                        <?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 ) );
+                        ?>
+                            <label><h4><b>ORIGIN STATE</b></h4></label>
+                             <select class ="custom_input" id = "wooss_origin_states_selected">
+                               <option data-state-code="default" value = "">
+                                <?php _e( 'Please select origin 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>
+                        <label><h4><b>ORIGIN STREET</b></h4></label>
+                        <input class ="custom_input" required type="text" name="origin_street" placeholder="<?php esc_attr_e("Please Enter Origin Street")?>" id="origin_street" value=" " />
+                        <label><h4><b>ORIGIN CITY</b></h4></label>
+                        <input class ="custom_input" required type="text" name="origin_city"  placeholder="<?php esc_html_e("Please Enter Origin City")?>" id="origin_city" value=" " />
+                        <?php //end of origin street?>
+                        <label><h4><b>DESTINATION COUNTRY</b></h4></label>
+                            <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>
+                        <?php // 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 ) );
+                        ?>
+                        <label><h4><b>DESTINATION STATE</b></h4></label>
+                            <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>';
+                                            }
+                                        }
+                                    }
+                                }
+                                ?>
+                            </select>
+                <?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 ); ?>"> -->
+                        <label><h4><b>DESTINATION STREET</b></h4></label>
+                        <input placeholder="Please Enter Destination Street" class ="custom_input" required type="text" name="destination_street"  id="destination_street" value=" " />
+                        <label><h4><b>DESTINATION CITY</b></h4></label>
+                        <input class ="custom_input" placeholder="Please Enter Destination City"  required type="text" name="destination_city"  id="destination_city" value=" " />
+                            <?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'>";
+                            }
+                            ?>
+                            <br />
+                            <div style="text-align : left; display: flex; flex-direction: row; justify-content: space-between; align-items: center;">
+                                <b id="dabs">
+                                    <?php
+                                /*  esc_attr_e( 'Fee: 0.0' ); */
+                                    ?>
+                                </b>
+                                <button id="wooss_request_shipment" class="button-primary"><?php esc_html_e( 'Request Shipment' ); ?></button>
+                            </div>
+                        </span>
+                    </span>
+                <?php
+            }
+        }
+    }
+                <div style="text-align:center;">
+                    <button id="wooss_request_shipment" class="button-primary"><?php esc_html_e( 'Request Shipment', 'wooss' ); ?></button>
+                </div>
+            </div>
+        </div>
+        <?php
+        echo ob_get_clean();
+    }
         /**
 …
             $_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;
+                }
-                $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;
+            $payload_data->origin_name             = sanitize_text_field($data["origin_name"]);
+            $payload_data->destination_country_code = sanitize_text_field($data["destination_country_code"]);
+            $payload_data->destination_state       = sanitize_text_field($data["destination_state"]);
+            $payload_data->destination_city        = sanitize_text_field($data["destination_city"]);
+            $payload_data->destination_street      = sanitize_text_field($data["destination_street"]);
+            $payload_data->destination_name        = sanitize_text_field($data["destination_name"]);
+            $payload_data->destination_phone       = sanitize_text_field($data["destination_phone"]);
+            $payload_data->items                   = $data["items"];
+            $payload_data->weight                  = sanitize_text_field($data["weight"]);
+            $payload_data->amount_to_receive       = sanitize_text_field($data["amount_to_receive"]);
+            $payload_data->origin_country          = sanitize_text_field($data["origin_country"]);
+            $payload_data->origin_state            = sanitize_text_field($data["origin_state"]);
+            $payload_data->origin_phone            = sanitize_text_field($data["origin_phone"]);
+            $payload_data->origin_street           = sanitize_text_field($data["origin_street"]);
+            $payload_data->origin_city             = sanitize_text_field($data["origin_city"]);
+            $payload_data->pickup_date             = sanitize_text_field($data["pickup_date"]);
+            $payload_data->incoming_option_code    = sanitize_text_field($data["incoming_option_code"]);
+            $payload_data->payment_option_code     = sanitize_text_field($data["payment_option_code"]);
+            $payload_data->delivery_callback = $webhook_url;
             $date = new DateTime();
 …
             $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 = Wooss_Sendbox_Shipping_API::checkAuth();
             $payload_data_json = wp_json_encode( $payload_data );
+            $payload_data_json = wp_json_encode( $data );
             $shipments_args = array(
 …
                 'methods'  => 'POST',
                 'callback' => array( $this, 'post_data' ),
+                'permission_callback' => '__return_true',
+            )
         );

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

-                      r2776138
+                      r3255662
     $(document).ready(function () {
+        $('select#wooss_destination_country').select2();
+        $('select#wooss_destination_state').select2();
+        //start of new kini i am trying for origin
+         $('select#wooss_origin_country').select2();
+        $('select#wooss_origin_states_selected').select2();
+        var payload = JSON.parse(document.getElementById('wooss_payload_data').value);
         var select_choosed = $('select[name="wc_order_action"]').val();
         $('select[name="wc_order_action"]').change(function () {
 …
         });
         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();
+    // Listen for changes on the courier selection dropdown
+    $('#wooss_selected_courier').on('change', function() {
+        var selectedOption = $(this).find('option:selected');
+        var newFee = selectedOption.data('courier-price');  // get the fee value from the data attribute
+        var courierId = selectedOption.val();                // get the courier id
+            var wooss_origin_name = $("input#origin_name").val();
+            $('input#origin_name').on('input',function(e){
+              wooss_origin_name = $(this).val();
+              });
+        // Update the fee in the element with id "dabs"
+        $('#dabs').text(newFee);
+        document.getElementById("dabs").style.color = "#ed2f59";
+              var wooss_origin_phone = $("input#origin_phone").val();
+              $('input#origin_phone').on('input',function(e){
+                wooss_origin_phone = $(this).val();
+                });
+        // Get values from origin fields; update payload if they have a non-empty value
+        var originName   = $('#wooss_origin_name').val();
+        var originPhone  = $('#wooss_origin_phone').val();
+        var originEmail  = $('#wooss_origin_email').val() || ''; // if there is an origin email field
+        var originStreet = $('#wooss_origin_street').val();
+        var originState  = $('#wooss_origin_state').val();
+        // For a disabled select, get the text of the selected option as the country value
+        var originCountry = $('#wooss_origin_country').find('option:selected').text();
+            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();
+        if (originName !== '') {
+            payload.origin_name = originName;
+        }
+        if (originPhone !== '') {
+            payload.origin_phone = originPhone;
+        }
+        if (originEmail !== '') {
+            payload.origin_email = originEmail;
+        }
+        if (originStreet !== '') {
+            payload.origin_street = originStreet;
+        }
+        if (originState !== '') {
+            payload.origin_state = originState;
+        }
+        if (originCountry !== '') {
+            payload.origin_country = originCountry
+            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();*/
+        // Add the selected courier id as service_code to the payload
+        if (courierId !== '') {
+            payload.service_code = courierId;
+        }
+            //var wooss_destination_city = $("input[name = 'wooss_destination_city']").val();
+            var wooss_postal_code = $(
+                "input#wooss_postal_code"
+            ).val();
+        if (!payload.destination_phone){
+            payload.destination_phone = payload.origin_phone
+        }
+            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 request_shipment_btn = $("button#wooss_request_shipment");
+    request_shipment_btn.on("submit click", function (e) {
+        e.preventDefault();
+            var wooss_destination_country = $("select#wooss_destination_country").val();
+            $("select#wooss_destination_country").change(function () {
+                wooss_destination_country = $(this).val();
+    var wooss_order_id = $("textarea#wooss_items_list").data("id");
+            })
+    $.blockUI({message: 'Requesting shipment...'});
+    payload.reference_code = wooss_order_id
+    payload.wooss_order_id = wooss_order_id
+    // Assuming payload is your payload object
+    Object.keys(payload).forEach(function(key) {
+        if (typeof payload[key] === 'string') {
+            payload[key] = payload[key].trim();
+        }
+    });
+            //start of new origin kini i am trying
+             var wooss_origin_country = $("select#wooss_origin_country").val();
+            $("select#wooss_origin_country").change(function () {
+                wooss_origin_country = $(this).val();
+            })
+    $.post(
+        wooss_ajax_object.wooss_ajax_url,
+        {
+            action: "request_shipments",
+            data: payload,
+            security: wooss_ajax_object.wooss_ajax_security
+        },
+        function (response) {
+            var wooss_origin_state = $("select#wooss_origin_states_selected").val();
+            $("select#wooss_origin_states_selected").change(function () {
+                wooss_origin_state = $(this).val();
+            $.unblockUI();
+            if (response == 0) {
+                alert("An error occured");
+            } else if (response == 1) {
+                alert("Shipment Successful");
+                window.location.reload();
+            } else if (response == 2 || response == 3) {
+            })
+             var wooss_origin_street = $("input#origin_street").val();
+             $('input#origin_street').on('input',function(e){
+               wooss_origin_street = $(this).val();
+               });
+               var wooss_origin_city = $("input#origin_city").val();
+               $('input#origin_city').on('input',function(e){
+                 wooss_origin_city = $(this).val();
+                 });
+                 var wooss_destination_city = $("input#destination_city").val();
+                 $('input#destination_city').on('input',function(e){
+                   wooss_destination_city = $(this).val();
+                   });
+                   var wooss_destination_street = $("input#destination_street").val();
+                   $('input#destination_street').on('input',function(e){
+                     wooss_destination_street = $(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_destination_city,
+                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();
+                    }
+                });
+        });
+        //doing for origin state
+         $("select#wooss_origin_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_origin_states_selected option:gt(0)").remove();
+                        $('select#wooss_origin_states_selected').append(response);
+                        $.unblockUI();
+                    }
+                });
+        });
+                alert(
+                    "insufficient funds login to your sendbox account and top up your wallet"
+                );
+            }
+        }
+    );
+});
     });
 })(jQuery);

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

-                      r3255617
+                      r3255662
              */
             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      = 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;
+                // Collect package data and build items list
+                $fee         = 0;
+                $quantity    = 0;
+                $items_lists = array();
+                foreach ( $package['contents'] as $item_id => $values ) {
+                    $weight = ! empty( $values['data']->get_weight() ) ? $values['data']->get_weight() : 0;
+                    $fee      += round( $values['line_total'] );
+                    $quantity += $values['quantity'];
+                    $output                    = new stdClass();
+                    $output->name              = $values['data']->get_name();
+                    $output->weight            = (int) $weight;
+                    $output->package_size_code = 'medium';
+                    $output->quantity          = $values['quantity'];
+                    $output->value             = round( $values['line_total'] );
+                    $output->amount_to_receive = round( $values['line_total'] );
+                    $output->item_type         = $values['data']->get_categories();
+                    $items_lists[]             = $output;
+                }
+                // Retrieve sendbox settings and API authentication
+                $sendbox_data     = get_option( 'sendbox_data' );
+                $wooss_extra_fees = isset( $sendbox_data['wooss_extra_fees'] ) ? esc_attr( $sendbox_data['wooss_extra_fees'] ) : 0;
+                $api_call         = new Wooss_Sendbox_Shipping_API();
+                $auth_header      = Wooss_Sendbox_Shipping_API::checkAuth();
+                if ( ! $auth_header ) {
+                    wc_add_notice( __( 'Unable to get shipping fees at this time.', 'wooss' ), 'error' );
+                    return;
+                }
+                // Build payload data (simplified; adjust as needed)
+                $origin_country = $sendbox_data['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'];
+                // Set destination details from package
+                $destination_country = wooss_get_countries( $package, 'country' );
+                $destination_state   = wooss_get_countries( $package, 'state' );
+                $destination_city    = ! empty( $package['destination']['city'] ) ? $package['destination']['city'] : 'Unknown City';
+                $destination_street  = ! empty( $package['destination']['address'] ) ? $package['destination']['address'] : __( 'Customer street', 'wooss' );
+                if ( empty( $destination_state ) ) {
+                    $destination_state = 'London';
+                }
+                // Remove any commas and extra data if needed
+                if ( strpos( $destination_state, ',' ) !== false ) {
+                    $stateParts         = explode( ',', $destination_state );
+                    $destination_state  = trim( end( $stateParts ) );
+                }
+                if ( strpos( $destination_city, ',' ) !== false ) {
+                    $cityParts         = explode( ',', $destination_city );
+                    $destination_city  = trim( $cityParts[0] );
+                }
+                // Calculate total weight (if needed adjust the logic)
+                $total_weight = $quantity * $weight;
+                // Pickup date: set as tomorrow
+                $date        = new DateTime();
+                $date->modify( '+1 day' );
+                $pickup_date = $date->format( DateTime::ATOM );
+                // Set other payload details
+                $currency = get_option( 'woocommerce_currency' );
+                $service_code = 'standard'; // Or adjust as necessary
+                $payload_array_data = array(
+                    'destination_name'      => __( 'Customer X', 'wooss' ),
+                    'destination_phone'     => __( '00000000', 'wooss' ),
+                    'destination_country'   => $destination_country,
+                    'destination_state'     => $destination_state,
+                    'destination_street'    => $destination_street,
+                    'destination_city'      => $destination_city,
+                    'items_list'            => $items_lists,
+                    'weight'                => $total_weight,
+                    'amount_to_receive'     => (int) $fee,
+                    'origin_country'        => $origin_country,
+                    'origin_name'           => '', // You can set these from API profile if available.
+                    'origin_street'         => $origin_street,
+                    'origin_state'          => $origin_state,
+                    'origin_phone'          => '', // Set as needed.
+                    '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,
+                    'currency'              => $currency,
+                    'service_code'          => $service_code,
+                );
+                // Make the API call only once
+                $delivery_quotes_details = wooss_calculate_shipping( $api_call, $payload_array_data, $auth_header );
+                if ( ! is_object( $delivery_quotes_details ) ) {
+                    wc_add_notice( __( 'Unable to calculate shipping rates.', 'wooss' ), 'error' );
+                    return;
+                }
+                // Check for multiple rates
+                if ( isset( $delivery_quotes_details->rates ) && is_array( $delivery_quotes_details->rates ) && ! empty( $delivery_quotes_details->rates ) ) {
+                    foreach ( $delivery_quotes_details->rates as $index => $rate ) {
+                        // Calculate final fee (ensure fee and extra fees are numeric)
+                        $quoted_fee = floatval( $rate->fee ) + floatval( $wooss_extra_fees );
+                        // Build label with optional service details
+                        $label = $this->title;
+                        if ( ! empty( $rate->service_code ) ) {
+                            $label .= ' - ' . $rate->service_code;
+                        } elseif ( ! empty( $rate->description ) ) {
+                            $label .= ' - ' . $rate->description;
+                        }
+                        $fee      += round( $values['line_total'] );
+                        $quantity += $values['quantity'];
+                        $outputs                    = new stdClass();
+                        $outputs->name              = $values['data']->get_name();
+                        $outputs->weight            = (int) $weight;
+                        $outputs->package_size_code = 'medium';
+                        $outputs->quantity          = $values['quantity'];
+                        $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 );
+                        // Create a unique rate ID (append index or service code)
+                        $rate_id = $this->id . '_' . $index;
+                        $new_rate = array(
+                            'id'      => $rate_id,
+                            'label'   => $label,
+                            'cost'    => $quoted_fee,
+                            'package' => $package,
+                        );
+                        $this->add_rate( $new_rate );
+                    }
+                    $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' );
+                    }
+                    //MAKING CHANGES HERE
+                    //$origin_country = 'Nigeria';// get_option('wooss_country');
+                    $origin_country = $sendbox_data['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',
+                            'Authorization' => $auth_header,
+                        ),
+                } elseif ( isset( $delivery_quotes_details->rate ) && is_object( $delivery_quotes_details->rate ) ) {
+                    // Fallback to single rate response
+                    $quoted_fee = floatval( $delivery_quotes_details->rate->fee ) + floatval( $wooss_extra_fees );
+                    $new_rate   = array(
+                        'id'      => $this->id,
+                        'label'   => $this->title,
+                        'cost'    => $quoted_fee,
+                        'package' => $package,
                     );
+                    $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;
+                        $origin_email = $response_body_from_profile_api->email;
+                    }
+                    $date = new DateTime();
+                    $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' );
+                    $currency = get_option('woocommerce_currency');
+                    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';
+                    }
+                    //remove comma
+                    if (strpos($destination_state, ',') !== false) {
+                        $stateParts = explode(',', $destination_state);
+                        $destination_state = trim(end($stateParts));
+                      }
+                    if ( empty( $destination_city ) ) {
+                        $destination_city = $package['destination']['city'];
+                    }
+                    if (strpos($destination_city, ',') !== false) {
+                        $cityParts = explode(',', $destination_city);
+                        $destination_city = trim($cityParts[0]);
+                      }
+                    $weight             = $quantity * $weight;
+                    $service_code = 'standard';
+                    $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,
+                        'deliver_priority_code' => 'next_day',
+                        'deliver_type_code'     => 'last_mile',
+                        'payment_option_code'   => 'prepaid',
+                        'incoming_option_code'  => $incoming_option_code,
+                        'pickup_date'           => $pickup_date,
+                        'currency'              => $currency,
+                        //updating based on the sendbox new change to pass service code September 25th 2024
+                        'service_code' => $service_code,
+                    );
+$delivery_quotes_details = wooss_calculate_shipping( $api_call, $payload_array_data, $auth_header );
+// Check if rates is set and is an array
+if ( isset( $delivery_quotes_details->rates ) && is_array( $delivery_quotes_details->rates ) ) {
+    // Loop through each rate option and add it as a shipping rate
+    foreach ( $delivery_quotes_details->rates as $rate ) {
+        // Calculate the total fee with any extra fees
+        $quoted_fee = $rate->fee + $wooss_extra_fees;
+        // Build the label. For example, you can append the service code or name if available.
+        // Adjust the label formatting as needed.
+        $label = $this->title;
+        if ( isset( $rate->service_code ) && !empty( $rate->service_code ) ) {
+            $label .= ' - ' . $rate->service_code;
+        } elseif ( isset( $rate->service_name ) && !empty( $rate->service_name ) ) {
+            $label .= ' - ' . $rate->service_name;
+        }
+        $new_rate = array(
+            'id'      => $this->id,
+            'label'   => $label,
+            'cost'    => $quoted_fee,
+            'package' => $package,
+        );
+        $this->add_rate( $new_rate );
+    }
+} else {
+    // Fallback in case the API response doesn't contain a rates array
+    $wooss_rates_type = $sendbox_data['wooss_rates_type'];
+    if ( 'maximum' == $wooss_rates_type && isset( $delivery_quotes_details->rate ) ) {
+        $quotes_fee = $delivery_quotes_details->rate->fee;
+    } elseif ( 'minimum' == $wooss_rates_type && isset( $delivery_quotes_details->rate ) ) {
+        $quotes_fee = $delivery_quotes_details->rate->fee;
+    }
+    $quoted_fee = $quotes_fee + $wooss_extra_fees;
+    $new_rate = array(
+        'id'      => $this->id,
+        'label'   => $this->title,
+        'cost'    => $quoted_fee,
+        'package' => $package,
+    );
+    $this->add_rate( $new_rate );
+}               }
+                    $this->add_rate( $new_rate );
+                } else {
+                    wc_add_notice( __( 'No shipping rates available.', 'wooss' ), 'error' );
+                }
+            }
+        }
+    }

sendbox-shipping/trunk/wooss.php

-                      r3255617
+                      r3255662
  * Plugin URI:        #
  * Description:       A Sendbox WooCommerce shipping plugin that enables you ship from your store to anywhere in the world.
  * Version:           5.1
+ * Version:           5.2
  * Author:            sendbox
  * Author URI:        https://sendbox.ng/
 …
  * Rename this for your plugin and update it as you release new versions.
  */
 define('WOOSS_VERSION', '5.1');
+define('WOOSS_VERSION', '5.2');
 /**

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

Trac UI Preferences

Plugin Directory

Context Navigation

Changeset 3255662

Legend:

sendbox-shipping/trunk/README.txt

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

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

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

sendbox-shipping/trunk/wooss.php

Download in other formats: