WordPress.org
Get WordPress

Plugin Directory

Changeset 3157723


Ignore:
Timestamp:
09/25/2024 04:36:23 PM (6 months ago)
Author:
aarsiv
Message:

New release on adding first name and last name if no company name found

Location:
a2z-fedex-shipping
Files:
63 added
3 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified a2z-fedex-shipping/trunk/a2zfedex_basic.php

    r3146511 r3157723  
    44 * Plugin URI: https://myshipi.com/
    55 * Description: Realtime Shipping Rates, shipping labels.
    6  * Version: 4.7.4
     6 * Version: 4.7.5
    77 * Author: Shipi
    88 * Author URI: https://myshipi.com/
    … …  
    27382738                       $order_shipping_first_name = $shipping_arr['first_name'];
    27392739                       $order_shipping_last_name = $shipping_arr['last_name'];
    2740                        $order_shipping_company = empty($shipping_arr['company']) ? $shipping_arr['first_name'] :  $shipping_arr['company'];
     2740                       $order_shipping_company = empty($shipping_arr['company']) ? $shipping_arr['first_name'] . " " . $shipping_arr['last_name'] :  $shipping_arr['company'];
    27412741                       $order_shipping_address_1 = $shipping_arr['address_1'];
    27422742                       $order_shipping_address_2 = $shipping_arr['address_2'];
    … …  
    29032903                            "custom_packs" => $custom_packs
    29042904                        );
    2905                        
    29062905                        //Manual Shipment
    29072906                        $manual_ship_url = "https://app.myshipi.com/label_api/create_shipment.php";
    … …  
    29642963            foreach ( $items as $item ) {
    29652964                $product_data = $item->get_data();
     2965                               
    29662966                $product = array();
    29672967                $product['product_quantity'] = $product_data['quantity'];
    … …  
    29972997                }
    29982998                $product['product_name'] = apply_filters("shipi_product_name_change", str_replace('"', '', $getproduct->get_name()), $getproduct->get_id());
    2999                 $product['price'] = (isset($product_data['subtotal']) && $product_data['subtotal'] > 0) ? round($product_data['subtotal']/$product_data['quantity'], 2): $getproduct->get_price();              $product['width'] = (!empty($getproduct->get_width())) ? round(wc_get_dimension($getproduct->get_width(),$mod_dim_unit,$woo_dim_unit)) : '';
     2999                $product['price'] = (isset($product_data['total']) && $product_data['total'] > 0) ? round($product_data['total']/$product_data['quantity'], 2): $getproduct->get_price();               $product['width'] = (!empty($getproduct->get_width())) ? round(wc_get_dimension($getproduct->get_width(),$mod_dim_unit,$woo_dim_unit)) : '';
    30003000                $product['height'] = (!empty($getproduct->get_height())) ? round(wc_get_dimension($getproduct->get_height(),$mod_dim_unit,$woo_dim_unit)) : '';
    30013001                $product['depth'] = (!empty($getproduct->get_length())) ? round(wc_get_dimension($getproduct->get_length(),$mod_dim_unit,$woo_dim_unit)) : '';

  • TabularUnified a2z-fedex-shipping/trunk/controllors/views/hitshippo_fedex_settings_view.php

    r3126043 r3157723  
    476476        $general_settings['hitshippo_fedex_access_key'] = sanitize_text_field(isset($_POST['hitshippo_fedex_access_key']) ? $_POST['hitshippo_fedex_access_key'] : '');
    477477        $general_settings['hitshippo_fedex_api_type'] = sanitize_text_field(isset($_POST['hitshippo_fedex_api_type']) ? $_POST['hitshippo_fedex_api_type'] : '');
    478         $general_settings['hitshippo_fedex_rest_grant_type'] = sanitize_text_field(isset($_POST['hitshippo_fedex_rest_grant_type']) ? $_POST['hitshippo_fedex_rest_grant_type'] : '');
     478        $general_settings['hitshippo_fedex_rest_grant_type'] = 'client_credentials';
    479479        $general_settings['hitshippo_fedex_rest_acc_no'] = sanitize_text_field(isset($_POST['hitshippo_fedex_rest_acc_no']) ? $_POST['hitshippo_fedex_rest_acc_no'] : '');
    480480        $general_settings['hitshippo_fedex_rest_api_key'] = sanitize_text_field(isset($_POST['hitshippo_fedex_rest_api_key']) ? $_POST['hitshippo_fedex_rest_api_key'] : '');
    … …  
    912912                    </tr>
    913913                    <tr class="REST_auth">
    914                         <td style=" width: 50%;padding:10px;">
    915                             <?php _e('API Grant type', 'hitshippo_fedex') ?><font style="color:red;">*</font>
    916                             <br/>
    917                             <select name="hitshippo_fedex_rest_grant_type" class="wc-enhanced-select" style="width:95%;padding:5px;">
    918                                 <option value="client_credentials" <?php echo (isset($general_settings['hitshippo_fedex_rest_grant_type']) && $general_settings['hitshippo_fedex_rest_grant_type'] == 'client_credentials') ? 'Selected="true"' : ''; ?>> Customer </option>
    919                                 <!-- <option value="csp_credentials" <?php echo (isset($general_settings['hitshippo_fedex_rest_grant_type']) && $general_settings['hitshippo_fedex_rest_grant_type'] == 'csp_credentials') ? 'Selected="true"' : ''; ?>> Compatible Provider customer </option> -->
    920                             </select>
    921                         </td>
    922914                        <td style="padding:10px;">
    923915                            <?php _e('Account number', 'hitshippo_fedex') ?><font style="color:red;">*</font>
    … …  
    928920                        <td style=" width: 50%;padding:10px;">
    929921                            <?php _e('API key', 'hitshippo_fedex') ?><font style="color:red;">*</font>
     922                            <input type="text" id="hitshippo_fedex_rest_api_key" name="hitshippo_fedex_rest_api_key" value="<?php echo (isset($general_settings['hitshippo_fedex_rest_api_key'])) ? $general_settings['hitshippo_fedex_rest_api_key'] : ''; ?>">
     923                        </td>
     924                        <td style="padding:10px;">
     925                            <?php _e('Secret key', 'hitshippo_fedex') ?><font style="color:red;">*</font>
     926                            <input type="text" id= "hitshippo_fedex_rest_secret_key" name="hitshippo_fedex_rest_secret_key" value="<?php echo (isset($general_settings['hitshippo_fedex_rest_secret_key'])) ? $general_settings['hitshippo_fedex_rest_secret_key'] : ''; ?>">
     927                        </td>
     928                    </tr>
     929                    <tr class="REST_auth">
     930                        <td style=" width: 50%;padding:10px;">
     931                            <?php _e('API key for Tracking', 'hitshippo_fedex') ?><font style="color:red;">*</font>
    930932                            <input type="text" id="hitshippo_fedex_rest_api_key" name="hitshippo_fedex_rest_api_key" value="<?php echo (isset($general_settings['hitshippo_fedex_rest_api_key'])) ? $general_settings['hitshippo_fedex_rest_api_key'] : ''; ?>">
    931933                        </td>

  • TabularUnified a2z-fedex-shipping/trunk/readme.txt

    r3146511 r3157723  
    55Tested up to: 6.6
    66Requires PHP: 5.6
    7 Stable tag: 4.7.4
     7Stable tag: 4.7.5
    88License: GPLv3 or later License
    99URI: http://www.gnu.org/licenses/gpl-3.0.html
    … …  
    159159
    160160== Changelog ==
     161= 4.7.5 =
     162    > [New] If company name is not found, then we sent full name as company name. Previouslly, we sent the first name alone.
    161163= 4.7.4 =
    162164    > [New] Handled the discount as handling cost.
Note: See TracChangeset for help on using the changeset viewer.