Changeset 3306040

Timestamp:

06/03/2025 08:36:11 PM (10 months ago)

Author:

bpostshippingplugins

Message:

Change how the plugin get's shipping address data

Location:

bpost-shipping-platform/trunk/includes

Files:

• admin/class-Bpost-options-ui.php (modified) (1 diff)
• admin/class-Bpost-shipping.php (modified) (22 diffs)
• class-woo-Bpost.php (modified) (8 diffs)
• core/class-Bpost-api-v3.php (modified) (2 diffs)

bpost-shipping-platform/trunk/includes/admin/class-Bpost-options-ui.php

@@ -236 +236 @@
 
 
-        BpostWoo::log("== Check Token [" . $this->token . '] ');
+        BpostWoo::log("== Check Token");
         if(!$this->token && $this->public_key && $this->private_key) {
 

bpost-shipping-platform/trunk/includes/admin/class-Bpost-shipping.php

@@ -27 +27 @@
 //    public $HasPickup;
 
-    private $rate_limiter;
-
-
     private function __construct(){
         $this->actions();
@@ -35 +32 @@
 
         $this->is_dev = defined('BPOST_DEV');
-        $this->rate_limiter = new Bpost_Rate_Limiter();
     }
 
@@ -171 +167 @@
     public function ajax_get_selected_carrier()
     {
-
         if (WC()->session->get('shipping_pickup_id') !== null) {
             WC()->session->__unset('shipping_pickup_id');
         }
-
         if (WC()->session->get('shipping_pickup_label') !== null) {
             WC()->session->__unset('shipping_pickup_label');
         }
-
         if (WC()->session->get('Bpost_pickup_extended') !== null) {
             WC()->session->__unset('Bpost_pickup_extended');
@@ -188 +181 @@
         }
 
+        //Unset previous Bpost_selected_carrier
+        if (WC()->session->get('Bpost_selected_carrier') !== null) {
+            WC()->session->__unset('Bpost_selected_carrier');
+        }
+        
         $frontendCarrier = isset($_GET['carrier']) ? sanitize_text_field(wp_unslash($_GET['carrier'])) : '';
 
@@ -216 +214 @@
             foreach ($value->settings['rules'] as $rule){
                 if ($rule['meta']['title'] == $frontendCarrier){
+               
                     $weightOption = [
                         'optionId'=> $value->id,
@@ -235 +234 @@
 
         if ($weightPudoOptions['service_level'] == 301 || $weightPudoOptions['service_level'] == 307 || $weightPudoOptions['service_level'] == 'BPSML02' || $weightPudoOptions['service_level'] == 'BPSML04'){
+            WC()->session->set('Bpost_selected_carrier', $number);
+           
             echo wp_json_encode(['status' => 1,'carrier_id' => $number,'pickupMandatory' => true]);die();
         }
@@ -246 +247 @@
 
             if($carrier && $HasPickup) {
-                // Display the select point button unless it's configured as impossible
-                $settings = $this->get_settings_from_shipping_method_id($flatRateOption['optionId']);
-
+                WC()->session->set('Bpost_selected_carrier', $carrier->Id);
+                
                 if($flatRateOption['pickupbehaviour'] != BpostOrder::$PICKUP_BEHAVIOUR_IMPOSSIBLE && ($flatRateOption['service_level'] == 301 || $flatRateOption['service_level'] == 307 || $flatRateOption['service_level'] == 'BPSML02' || $flatRateOption['service_level'] == 'BPSML04')) {
                     echo wp_json_encode(['status' => 1,'carrier_id' => $carrier->Id,'pickupMandatory' => true]);die();
@@ -318 +318 @@
         $client_id = $this->get_client_identifier();
 
-        // Check rate limit
-        if ($this->rate_limiter->is_limited($client_id, 'get_pickup_locations')) {
-            wp_send_json_error([
-                'message' => 'Rate limit exceeded. Please try again later.',
-                'remaining_attempts' => $this->rate_limiter->get_remaining_attempts($client_id, 'get_pickup_locations')
-            ]);
-            return;
-        }
 
         // Start timing
@@ -350 +342 @@
             $shipping_method_id = $carrier->Id;
         }
-
-        // Create a cache key based on address and coordinates
-//        $cache_key = 'bpost_pickup_points_' . md5(json_encode([
-//                'address' => $sanitized_address,
-//                'carrier_id' => $shipping_method_id,
-//                'lat' => isset($sanitized_address['Lat']) ? $sanitized_address['Lat'] : 0,
-//                'lng' => isset($sanitized_address['Lng']) ? $sanitized_address['Lng'] : 0
-//            ]));
-//
-//        // Try to get cached results
-//        $cached_results = get_transient($cache_key);
-//        if ($cached_results !== false) {
-//            // Calculate execution time
-//            $end_time = microtime(true);
-//            $execution_time = ($end_time - $start_time) * 1000;
-//
-//            // Add timing information to response
-//            $cached_results->execution_time = round($execution_time, 2);
-//            $cached_results->execution_time_unit = 'ms';
-//            $cached_results->from_cache = true;
-//
-//            wp_send_json($cached_results);
-//            return;
-//        }
 
         $pickup_points = BpostWoo::get_pickup_locations($address, $shipping_method_id);
@@ -463 +431 @@
                 continue;
             }
-            
+
             // Sanitize setting name and value
             $setting_name = sanitize_text_field($setting['name']);
             $setting_value = sanitize_text_field($setting['value']);
-            
+
             // Validate setting name (only allow alphanumeric and underscore)
             if (!preg_match('/^[a-zA-Z0-9_]+$/', $setting_name)) {
                 continue;
             }
-            
+
             $settings[$setting_name] = $setting_value;
         }
@@ -484 +452 @@
         $setting_name = 'wbs_' . absint($instance_id) . '_Bpost';
         update_option($setting_name, $settings);
-        
+
         wp_send_json_success(array(
             'message' => 'Settings saved successfully',
@@ -512 +480 @@
         $upload_dir = wp_upload_dir();
         $bpost_dir = $upload_dir['basedir'] . '/bpost-shipping';
-        
+
         // Only delete files if directory exists
         if (file_exists($bpost_dir)) {
@@ -589 +557 @@
                     // Add carrier ID initialization to the main script
                     wp_add_inline_script('bpost-pickup-script', "jQuery(function(){ Bpost.platform.setCarrier(" . esc_js($carrier->Id) . "); });");
-                    
+
                     $Bpost_options .= "</td></tr>";
                 }
@@ -776 +744 @@
     /**
      * Get the upload directory path for Bpost shipping files
-     * 
+     *
      * @return string The path to the Bpost shipping files directory
      */
@@ -782 +750 @@
         $upload_dir = wp_upload_dir();
         $bpost_dir = $upload_dir['basedir'] . '/bpost-shipping';
-        
+
         // Create directory if it doesn't exist
         if (!file_exists($bpost_dir)) {
             wp_mkdir_p($bpost_dir);
         }
-        
+
         // Ensure directory is writable
         if (!is_writable($bpost_dir)) {
@@ -793 +761 @@
             return false;
         }
-        
+
         return $bpost_dir;
     }
@@ -800 +768 @@
         $class_name = $this->get_class_name_for_carrier($carrier) . 'Free';
         $file_name = 'class-Bpost-shipping' . $class_name . '.php';
-        
+
         // Get the upload directory path
         $upload_dir = $this->get_shipping_files_dir();
@@ -807 +775 @@
             return;
         }
-        
+
         $file_path = $upload_dir . '/' . $file_name;
 
@@ -820 +788 @@
         $class_name = $this->get_class_name_for_carrier($carrier);
         $file_name = 'class-Bpost-shipping' . $class_name . '.php';
-        
+
         // Get the upload directory path
         $upload_dir = $this->get_shipping_files_dir();
@@ -827 +795 @@
             return;
         }
-        
+
         $file_path = $upload_dir . '/' . $file_name;
 
@@ -840 +808 @@
         $class_name = $this->get_class_name_for_carrier($carrier).'Weight';
         $weighbasedFile = 'class-Bpost-shipping' . $class_name . '-weight.php';
-        
+
         // Get the upload directory path
         $upload_dir = $this->get_shipping_files_dir();
@@ -847 +815 @@
             return;
         }
-        
+
         $file_path = $upload_dir . '/' . $weighbasedFile;
 

bpost-shipping-platform/trunk/includes/class-woo-Bpost.php

@@ -16 +16 @@
 include_once (BPOST_PLUGIN_PATH.'includes/plugins/class-Bpost-connector.php');
 include_once (BPOST_PLUGIN_PATH.'includes/plugins/class-Bpost-marketplace.php');
-include_once BPOST_PLUGIN_PATH.'/includes/core/class-Bpost-rate-limiter.php';
 
 /**
@@ -230 +229 @@
      */
     public function handle_update_settings() {
+        $respdata = new stdClass();
 
         // Check if POST request has data
@@ -238 +238 @@
             $data = json_decode($raw_data);
 
-        }
-    }
-
-
-    private function get_request_signature()
-    {
-        $hmac256 = hash_hmac('sha256', get_option('Bpost_private_key'), true);
-        return base64_encode($hmac256);
-    }
-
-    /**
-     * Actions to perform after all plugins are loaded.
-     */
-    public function plugins_loaded() {
-        $this->check_marketplaces();
-        $this->load_plugin_textdomain();
-    }
-
-    /**
-     * Check if marketplace plugins are active and include necessary files.
-     */
-    public function check_marketplaces() {
-        global $Bpost_dokan,$Bpost_wcfm;
-
-        $active_plugins =  apply_filters('active_plugins', get_option( 'active_plugins' ));
-        if ( in_array( 'dokan-lite/dokan.php', $active_plugins )) {
-            require_once(BPOST_PLUGIN_PATH . 'includes/plugins/class-Bpost-dokan.php');
-        }
-
-        if (in_array('wc-multivendor-marketplace/wc-multivendor-marketplace.php', $active_plugins)) {
-            require_once(BPOST_PLUGIN_PATH . 'includes/plugins/class-Bpost-wcfm.php');
-        }
-    }
-
-    /**
-     * Handle plugin upgrade and call necessary functions.
-     *
-     * @param WP_Upgrader $upgrader_object
-     * @param array $options
-     */
-    public function upgrade_function( $upgrader_object, $options ) {
-        global $Bpost;
-
-        $current_plugin_path_name = plugin_basename( __FILE__ );
-
-        if ($options['action'] == 'update' && $options['type'] == 'plugin' ){
-            if(isset($options['plugins'])){
-                foreach($options['plugins'] as $each_plugin){
-                    if ($each_plugin == $current_plugin_path_name){
-                        self::Bpost_check_upgrade();
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Load plugin text domain for translations.
-     */
-    public function load_plugin_textdomain() {
-        global $Bpost;
-
-        load_plugin_textdomain( 'Bpost-for-woocommerce', false, basename( dirname( __FILE__ ) ) . '/languages/' );
-    }
-
-    /**
-     * Automatically export orders when the specified WooCommerce order status is reached.
-     *
-     * @param int $order_id
-     */
-    public function auto_export($order_id) {
-        global $wpdb;
-
-        error_log("Auto export order_id: $order_id ");
-
-        $query = $wpdb->prepare("SELECT status FROM {$wpdb->prefix}Bpost WHERE id = %d", $order_id);
-
-        // phpcs:ignore
-        $exported = $wpdb->get_results($query);
-
-        self::log("Exported " . var_export($exported,true));
-
-        if (!$exported || ($exported[0]->status != BpostOrder::$STATUS_EXPORTED_SUCCESSFULLY) ) {
-            BpostWooOrder::export(array($order_id));
-        } else if( self::$is_dev) {
-            self::log("order $order_id was already exported status is $exported[0]->status:  ignore");
-        }
-    }
-
-    /**
-     * Append filters to WooCommerce.
-     */
-    public function filters() {
-        add_filter('woocommerce_order_details_after_order_table_items', array($this,'print_pickup_label'));
-
-        /**
-         * Add spanish special zones like canary islands
-         */
-        add_filter( 'woocommerce_states', array($this, 'add_states') );
-
-        add_filter( 'woocommerce_package_rates', array( $this, 'rates_filter'), 10, 2 );
-    }
-
-    /**
-     * Validate shipping rate.
-     *
-     * @param WC_Shipping_Rate $r
-     * @param array $package
-     * @return bool
-     */
-    public function is_rate_valid( $r , $package ) {
-        $options = get_option( 'woocommerce_' . $r->method_id . '_' . $r->instance_id . '_settings' );
-
-
-        // Check if `excludeclasses` exists
-        if( isset( $options['excludeclasses'] ) && $options['excludeclasses'] ) {
-            BpostWoo::log( $r->label );
-            $opt_exclude_classes = explode( ',', $options['excludeclasses'] );
-            $contains_classes_to_exclude = false;
-
-            // Check if the package contains products that have at least one of the selected classes
-            foreach ( $package['contents'] as $key => $item ) {
-                foreach ( $opt_exclude_classes as $c2exclude ) {
-                    $terms = get_the_terms( $item['product_id'], 'product_shipping_class' );
-                    if ( $terms ) {
-                        foreach( $terms as $term ) {
-                            $contains_classes_to_exclude |=  $term->term_id == $c2exclude;
-                        }
-                    }
-                }
-            }
-
-            BpostWoo::log("contains class " . ( $contains_classes_to_exclude ? 1 : 0 ));
-            if ( $contains_classes_to_exclude ) {
-                return false; // Exclude if it contains the class
-            }
-        }
-        // Check if `min_amount` is set and valid
-        if (isset($options['requires']) && $options['requires'] == 'min_amount' &&  isset( $options['min_amount'] ) && !empty( $options['min_amount'] ) ) {
-
-            $min_amount =  $options['min_amount']; // Convert string "2,00" to float
-            $cart_subtotal = WC()->cart->get_subtotal();
-
-            BpostWoo::log("Min amount: " . $min_amount . ", Cart subtotal: " . $cart_subtotal);
-
-            if ( (int) $cart_subtotal < (int)$min_amount ) {
-
-                BpostWoo::log("Cart subtotal is below the minimum amount, excluding shipping method.");
-                return false; // Exclude if cart subtotal is less than the minimum amount
-            }
-        }
-        if( isset( $options['max_amount'] ) && !empty( $options['max_amount'] ) ){
-            $max_amount =  $options['max_amount'];
-            $cart_subtotal = WC()->cart->get_subtotal();
-
-            BpostWoo::log("Max amount: " . $max_amount . ", Cart subtotal: " . $cart_subtotal);
-
-            if ( (int) $cart_subtotal >= (int)$max_amount ) {
-
-                BpostWoo::log("Cart subtotal is below the minimum amount, excluding shipping method.");
-                return false; // Exclude if cart subtotal is less than the minimum amount
-            }
-        }
-
-        return true; // Shipping method is valid
-    }
-
-    /**
-     * Filter and return valid shipping rates.
-     *
-     * @param array $rates
-     * @param array $package
-     * @return array
-     */
-    public function rates_filter ( $rates, $package ) {
-
-        $free_not_local = false;
-        if ( get_option('Bpost_hide_not_free') ) {
-            $free = array();
-            foreach ( $rates as $id => $r) {
-                if ( $r->cost == 0 && $this->is_rate_valid( $r, $package ) ) {
-                    $free_not_local |= ($r->method_id != 'local_pickup');
-                    $free[$id] = $r;
-                }
-            }
-
-            if ( !empty( $free ) && $free_not_local) {
-                $rates = $free;
-            }
-        }
-
-        $newrates = array();
-        foreach ( $rates as $id => $r) {
-            if( $this->is_rate_valid($r, $package) ) {
-                $newrates[$id] = $r ;
-            }
-        }
-
-        return $newrates;
-    }
-
-    /**
-     * Add custom states to WooCommerce.
-     *
-     * @param array $states
-     * @return array
-     */
-    public function add_states ($states) {
-        if( !get_option('Bpost_provinces',false)){
-            return $states;
-        }
-
-        foreach ( BpostWoo::$provinces as $country => $values){
-            foreach ($values as $code => $name) {
-                $states[$country][$code] = esc_html($name);
-            }
-        }
-        return $states;
-    }
-
-    /**
-     * Parse custom query variables.
-     *
-     * @param WP $wp
-     */
-    public function parse_request( $wp ='' ) {
-        if( !empty( $wp->query_vars['Bpost_update'] ) ) {
-            $this->api_update();
-        }
-
-        if( !empty( $wp->query_vars['Bpost_create_account'] ) ) {
-            $this->create_account();
-        }
-
-//        if( !empty($wp->query_vars['Bpost_request_account'] ) && Bpost_is_marketplace() ) {
-//            BpostMarketplace::instance()->request_account();
-//        }
-    }
-
-    /**
-     * Handle API update requests.
-     */
-    public function api_update() {
-        // Set the response type to JSON
-        header("Content-Type:application/json");
-
-        // Define the statuses
-        $statuses = [
-            0 => '',
-            1 => 'wc-pending',
-            2 => 'wc-processing',
-            3 => 'wc-on-hold',
-            4 => 'wc-completed',
-            5 => 'wc-cancelled',
-            6 => 'wc-refunded',
-            7 => 'wc-failed',
-        ];
-
-
-        // Check if POST request has data
-        if ($_SERVER['REQUEST_METHOD'] === 'POST' && (!empty($_POST) || file_get_contents("php://input"))) {
-
-            // Assume that 'data' field in POST contains the raw JSON data
-            $raw_data = isset($_POST['data']) ? sanitize_text_field(wp_unslash($_POST['data'])) : file_get_contents("php://input");
-
-            error_log("APIUPDATE");
-
-            // If no content is present, return an error message
-            if (!trim($raw_data)) {
-                die(wp_json_encode((object)array("Error" => "No content")));
-            }
-
-            // Decode the JSON data
-            $data = json_decode($raw_data);
-
-
-            // Trigger the action with the decoded data
-            do_action('Bpost_api_update', $data);
-
-            // Get callback URL and API instance
-            $url = self::get_callback_url();
-            $api = self::get_api();
-
-            // Validate the update request
-            if (!$api->validate_update_request($data->Status, $data->TrackingId, $url, $data->Hash)) {
-                self::log("RESTAURE!! API_UPDATE INVALID SIGNATURE IGNORING ");
-                die(wp_json_encode((object)array("Error" => "Invalid Signature")));
-            }
-
-            // Handle the 'getshippingmethods' action
-            if (isset($data->Action) && sanitize_text_field($data->Action) == 'getshippingmethods') {
-                echo wp_kses(BpostShipping::get_shipping_methods());
-                die();
-            }
+            // Define the statuses
+            $statuses = [
+                0 => '',
+                1 => 'wc-pending',
+                2 => 'wc-processing',
+                3 => 'wc-on-hold',
+                4 => 'wc-completed',
+                5 => 'wc-cancelled',
+                6 => 'wc-refunded',
+                7 => 'wc-failed',
+            ];
 
             // Check action and hash match
@@ -540 +257 @@
                 update_option('Bpost_hide_not_free', 0);
                 update_option('Bpost_export_virtual_products', 1);
-                $respdata = new stdClass();
 
                 // Prepare response data
@@ -557 +273 @@
                 die(wp_json_encode($respdata));
             }
-
-
+        }
+    }
+
+
+    private function get_request_signature()
+    {
+        $hmac256 = hash_hmac('sha256', get_option('Bpost_private_key'), true);
+        return base64_encode($hmac256);
+    }
+
+    /**
+     * Actions to perform after all plugins are loaded.
+     */
+    public function plugins_loaded() {
+        $this->check_marketplaces();
+        $this->load_plugin_textdomain();
+    }
+
+    /**
+     * Check if marketplace plugins are active and include necessary files.
+     */
+    public function check_marketplaces() {
+        global $Bpost_dokan,$Bpost_wcfm;
+
+        $active_plugins =  apply_filters('active_plugins', get_option( 'active_plugins' ));
+        if ( in_array( 'dokan-lite/dokan.php', $active_plugins )) {
+            require_once(BPOST_PLUGIN_PATH . 'includes/plugins/class-Bpost-dokan.php');
+        }
+
+        if (in_array('wc-multivendor-marketplace/wc-multivendor-marketplace.php', $active_plugins)) {
+            require_once(BPOST_PLUGIN_PATH . 'includes/plugins/class-Bpost-wcfm.php');
+        }
+    }
+
+    /**
+     * Handle plugin upgrade and call necessary functions.
+     *
+     * @param WP_Upgrader $upgrader_object
+     * @param array $options
+     */
+    public function upgrade_function( $upgrader_object, $options ) {
+        global $Bpost;
+
+        $current_plugin_path_name = plugin_basename( __FILE__ );
+
+        if ($options['action'] == 'update' && $options['type'] == 'plugin' ){
+            if(isset($options['plugins'])){
+                foreach($options['plugins'] as $each_plugin){
+                    if ($each_plugin == $current_plugin_path_name){
+                        self::Bpost_check_upgrade();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Load plugin text domain for translations.
+     */
+    public function load_plugin_textdomain() {
+        global $Bpost;
+
+        load_plugin_textdomain( 'Bpost-for-woocommerce', false, basename( dirname( __FILE__ ) ) . '/languages/' );
+    }
+
+    /**
+     * Automatically export orders when the specified WooCommerce order status is reached.
+     *
+     * @param int $order_id
+     */
+    public function auto_export($order_id) {
+        global $wpdb;
+
+        error_log("Auto export order_id: $order_id ");
+
+        $query = $wpdb->prepare("SELECT status FROM {$wpdb->prefix}Bpost WHERE id = %d", $order_id);
+
+        // phpcs:ignore
+        $exported = $wpdb->get_results($query);
+
+        self::log("Exported " . var_export($exported,true));
+
+        if (!$exported || ($exported[0]->status != BpostOrder::$STATUS_EXPORTED_SUCCESSFULLY) ) {
+            BpostWooOrder::export(array($order_id));
+        } else if( self::$is_dev) {
+            self::log("order $order_id was already exported status is $exported[0]->status:  ignore");
+        }
+    }
+
+    /**
+     * Append filters to WooCommerce.
+     */
+    public function filters() {
+        add_filter('woocommerce_order_details_after_order_table_items', array($this,'print_pickup_label'));
+
+        /**
+         * Add spanish special zones like canary islands
+         */
+        add_filter( 'woocommerce_states', array($this, 'add_states') );
+
+        add_filter( 'woocommerce_package_rates', array( $this, 'rates_filter'), 10, 2 );
+    }
+
+    /**
+     * Validate shipping rate.
+     *
+     * @param WC_Shipping_Rate $r
+     * @param array $package
+     * @return bool
+     */
+    public function is_rate_valid( $r , $package ) {
+        $options = get_option( 'woocommerce_' . $r->method_id . '_' . $r->instance_id . '_settings' );
+
+
+        // Check if `excludeclasses` exists
+        if( isset( $options['excludeclasses'] ) && $options['excludeclasses'] ) {
+            BpostWoo::log( $r->label );
+            $opt_exclude_classes = explode( ',', $options['excludeclasses'] );
+            $contains_classes_to_exclude = false;
+
+            // Check if the package contains products that have at least one of the selected classes
+            foreach ( $package['contents'] as $key => $item ) {
+                foreach ( $opt_exclude_classes as $c2exclude ) {
+                    $terms = get_the_terms( $item['product_id'], 'product_shipping_class' );
+                    if ( $terms ) {
+                        foreach( $terms as $term ) {
+                            $contains_classes_to_exclude |=  $term->term_id == $c2exclude;
+                        }
+                    }
+                }
+            }
+
+            BpostWoo::log("contains class " . ( $contains_classes_to_exclude ? 1 : 0 ));
+            if ( $contains_classes_to_exclude ) {
+                return false; // Exclude if it contains the class
+            }
+        }
+        // Check if `min_amount` is set and valid
+        if (isset($options['requires']) && $options['requires'] == 'min_amount' &&  isset( $options['min_amount'] ) && !empty( $options['min_amount'] ) ) {
+
+            $min_amount =  $options['min_amount']; // Convert string "2,00" to float
+            $cart_subtotal = WC()->cart->get_subtotal();
+
+            BpostWoo::log("Min amount: " . $min_amount . ", Cart subtotal: " . $cart_subtotal);
+
+            if ( (int) $cart_subtotal < (int)$min_amount ) {
+
+                BpostWoo::log("Cart subtotal is below the minimum amount, excluding shipping method.");
+                return false; // Exclude if cart subtotal is less than the minimum amount
+            }
+        }
+        if( isset( $options['max_amount'] ) && !empty( $options['max_amount'] ) ){
+            $max_amount =  $options['max_amount'];
+            $cart_subtotal = WC()->cart->get_subtotal();
+
+            BpostWoo::log("Max amount: " . $max_amount . ", Cart subtotal: " . $cart_subtotal);
+
+            if ( (int) $cart_subtotal >= (int)$max_amount ) {
+
+                BpostWoo::log("Cart subtotal is below the minimum amount, excluding shipping method.");
+                return false; // Exclude if cart subtotal is less than the minimum amount
+            }
+        }
+
+        return true; // Shipping method is valid
+    }
+
+    /**
+     * Filter and return valid shipping rates.
+     *
+     * @param array $rates
+     * @param array $package
+     * @return array
+     */
+    public function rates_filter ( $rates, $package ) {
+
+        $free_not_local = false;
+        if ( get_option('Bpost_hide_not_free') ) {
+            $free = array();
+            foreach ( $rates as $id => $r) {
+                if ( $r->cost == 0 && $this->is_rate_valid( $r, $package ) ) {
+                    $free_not_local |= ($r->method_id != 'local_pickup');
+                    $free[$id] = $r;
+                }
+            }
+
+            if ( !empty( $free ) && $free_not_local) {
+                $rates = $free;
+            }
+        }
+
+        $newrates = array();
+        foreach ( $rates as $id => $r) {
+            if( $this->is_rate_valid($r, $package) ) {
+                $newrates[$id] = $r ;
+            }
+        }
+
+        return $newrates;
+    }
+
+    /**
+     * Add custom states to WooCommerce.
+     *
+     * @param array $states
+     * @return array
+     */
+    public function add_states ($states) {
+        if( !get_option('Bpost_provinces',false)){
+            return $states;
+        }
+
+        foreach ( BpostWoo::$provinces as $country => $values){
+            foreach ($values as $code => $name) {
+                $states[$country][$code] = esc_html($name);
+            }
+        }
+        return $states;
+    }
+
+    /**
+     * Parse custom query variables.
+     *
+     * @param WP $wp
+     */
+    public function parse_request( $wp ='' ) {
+        if( !empty( $wp->query_vars['Bpost_update'] ) ) {
+            $this->api_update();
+        }
+
+        if( !empty( $wp->query_vars['Bpost_create_account'] ) ) {
+            $this->create_account();
+        }
+
+//        if( !empty($wp->query_vars['Bpost_request_account'] ) && Bpost_is_marketplace() ) {
+//            BpostMarketplace::instance()->request_account();
+//        }
+    }
+
+    /**
+     * Handle API update requests.
+     */
+    public function api_update() {
+        // Set the response type to JSON
+        header("Content-Type:application/json");
+
+        // Check if POST request has data
+        if ($_SERVER['REQUEST_METHOD'] === 'POST' && (!empty($_POST) || file_get_contents("php://input"))) {
+
+            // Assume that 'data' field in POST contains the raw JSON data
+            $raw_data = isset($_POST['data']) ? sanitize_text_field(wp_unslash($_POST['data'])) : file_get_contents("php://input");
+
+            error_log("APIUPDATE");
+
+            // If no content is present, return an error message
+            if (!trim($raw_data)) {
+                die(wp_json_encode((object)array("Error" => "No content")));
+            }
+
+            // Decode the JSON data
+            $data = json_decode($raw_data);
+
+
+            // Trigger the action with the decoded data
+            do_action('Bpost_api_update', $data);
+
+            // Get callback URL and API instance
+            $url = self::get_callback_url();
+            $api = self::get_api();
+
+            // Validate the update request
+            if (!$api->validate_update_request($data->Status, $data->TrackingId, $url, $data->Hash)) {
+                self::log("RESTAURE!! API_UPDATE INVALID SIGNATURE IGNORING ");
+                die(wp_json_encode((object)array("Error" => "Invalid Signature")));
+            }
+
+            // Handle the 'getshippingmethods' action
+            if (isset($data->Action) && sanitize_text_field($data->Action) == 'getshippingmethods') {
+                echo wp_kses(BpostShipping::get_shipping_methods());
+                die();
+            }
 
             // Handle the order update
@@ -649 +644 @@
             wp_register_script('Bpost_script' , BPOST_PLUGIN_URL.'assets/js/Bpost.js', array ( 'jquery' ),'2.2',['in_footer' => true] );
             wp_enqueue_script( 'Bpost_script');
-            
-            // Localize the script with new data
-            wp_localize_script('Bpost_script', 'bpost_ajax', array(
-                'ajax_url' => admin_url('admin-ajax.php'),
-                'nonce' => wp_create_nonce('bpost-ajax-nonce')
-            ));
-            
             wp_register_style( 'Bpost_style', BPOST_PLUGIN_URL.'assets/css/Bpost.css',[],'1.0.0' );
             wp_register_style( 'checkout_style', BPOST_PLUGIN_URL.'assets/css/checkout.css',[],'1.0.0' );
@@ -663 +651 @@
             wp_register_script('Bpost_connect' , BPOST_PLUGIN_URL.'assets/js/connect.js' ,[],'1.0.0',['in_footer' => true]);
             wp_enqueue_script( 'Bpost_connect');
-            
-            // Localize the connect script as well
-            wp_localize_script('Bpost_connect', 'bpost_connect_ajax', array(
-                'ajax_url' => admin_url('admin-ajax.php'),
-                'nonce' => wp_create_nonce('bpost-connect-nonce')
-            ));
+
         }
 
@@ -1132 +1115 @@
         }
 
-        if (!get_option(BpostWoo::$OPTION_BPOST_CACHE_KEY) && get_option(BpostShippingPlatform::$OPTION_BPOST_PUBLIC_KEY)) {
-            update_option(BpostWoo::$OPTION_BPOST_CACHE_KEY, sanitize_text_field(get_option(BpostShippingPlatform::$OPTION_BPOST_PUBLIC_KEY)));
-            update_option(BpostWoo::$OPTION_CALLBACK_URL, esc_url(BpostShippingPlatform::get_callback_url()));
+        if (!get_option(BpostWoo::$OPTION_BPOST_CACHE_KEY) && get_option(BpostWoo::$OPTION_BPOST_PUBLIC_KEY)) {
+            update_option(BpostWoo::$OPTION_BPOST_CACHE_KEY, sanitize_text_field(get_option(BpostWoo::$OPTION_BPOST_PUBLIC_KEY)));
+            update_option(BpostWoo::$OPTION_CALLBACK_URL, esc_url(BpostWoo::get_callback_url()));
         }
 

bpost-shipping-platform/trunk/includes/core/class-Bpost-api-v3.php

@@ -335 +335 @@
      */
     public function get_pickup_locations($address, $carrier_id){
-        if(!$carrier_id){
+        if(!WC()->session->get('Bpost_selected_carrier')){
             return array(
                 'Error' => array(
                     'Id' => 1111,
-                    'Info' => "Invalid carrier of id $carrier_id"
+                    'Info' => "Invalid carrier of id " . WC()->session->get('Bpost_selected_carrier')
                 )
             );
         }
 
-        if(is_numeric($address['Streetname2'])){
-            $address['HouseNumber'] = $address['Streetname2'];
-            $address['Streetname2'] ='';
-        }
-        $dataToSend = [
-            "City" => $address['City'],
-            "Country" => WC()->customer->get_shipping_country(),
-            "PostalCode" => $address['PostalCode'],
-            "Streetname1" => $address['Streetname1'],
-            "Lat" => $address['Lat'],
-            "Long" => $address['Long']
-        ];
+
+        // If session Bpost_selected_carrier exists, use WC()->customer for address fields
+        if (isset(WC()->session) && WC()->session->get('Bpost_selected_carrier')) {
+            $dataToSend = [
+                "City" => WC()->customer->get_shipping_city(),
+                "Country" => WC()->customer->get_shipping_country(),
+                "PostalCode" => WC()->customer->get_shipping_postcode(),
+                "Streetname1" => WC()->customer->get_shipping_address_1(),
+                "Lat" => isset($address['Lat']) ? $address['Lat'] : '',
+                "Long" => isset($address['Long']) ? $address['Long'] : ''
+            ];
+        } 
 
         $lang = $this->get_ISO2_from_localisation(get_locale());
@@ -361 +361 @@
         $data = array(
             'Address' =>  $dataToSend,
-            'CarrierId' => $carrier_id,
+            'CarrierId' => WC()->session->get('Bpost_selected_carrier'),
             'Language' => $lang === "nl" ? "nl" : "fr"
         );
 
         $this->log("get_pickup_locations Address " . var_export($address, true ) . ";  
-            Carrier :" . $carrier_id );
+            Carrier :" . WC()->session->get('Bpost_selected_carrier') );
         $curl =  $this->send_to_api('POST','/pickuppoints', $data);
         return $curl->response;