WordPress.org
Get WordPress

Plugin Directory

Changeset 2458311


Ignore:
Timestamp:
01/18/2021 02:17:21 PM (5 years ago)
Author:
hfddev
Message:

הוספת אימות בעת בקשה לביטול משלוח

Location:
hfd-integration/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • hfd-integration/trunk/class/Admin.php

    r2451819 r2458311  
    6767            $orderID = sanitize_text_field( $_POST['orderID'] );
    6868            $helper = \Hfd\Woocommerce\Container::get('Hfd\Woocommerce\Setting');
    69             $cancel_shipment_url = $helper->get( 'betanet_epost_hfd_cancel_shipment_url' );
    70             $cancel_shipment_url = str_replace( "{shipping_number}", $orN, $cancel_shipment_url );
    71             $response_run = wp_remote_get( $cancel_shipment_url );
    72             $api_response_run = wp_remote_retrieve_body( $response_run );
    73             $api_response_run = simplexml_load_string( $api_response_run );
    74             if( $api_response_run === false ){
    75                 $out = array( "success" => 0, "msg" => __( "Shipment not tracked", HFD_WC_EPOST ) );
     69            $authToken = $helper->get( 'betanet_epost_hfd_auth_token' );
     70            if( !empty( $authToken ) ){
     71                $cancel_shipment_url = $helper->get( 'betanet_epost_hfd_cancel_shipment_url' );
     72                $cancel_shipment_url = str_replace( "{shipping_number}", $orN, $cancel_shipment_url );
     73                $args = array(
     74                    'headers' => array(
     75                        'Authorization' => 'Bearer '.$authToken
     76                    )
     77                );
     78                $response_run = wp_remote_get( $cancel_shipment_url, $args );
     79                $api_response_run = wp_remote_retrieve_body( $response_run );
     80                $api_response_run = simplexml_load_string( $api_response_run );
     81                if( $api_response_run === false ){
     82                    $out = array( "success" => 0, "msg" => __( "Shipment not tracked", HFD_WC_EPOST ) );
     83                }else{
     84                    $api_response_run  = json_encode( $api_response_run );
     85                    $api_response_run = json_decode( $api_response_run, true );
     86                    update_post_meta( $orderID, 'hfd_ship_cancel_response', maybe_serialize( $api_response_run ) );
     87                    if( isset( $api_response_run['Status'] ) && $api_response_run['Status'] == "OK" ){
     88                        $corder = wc_get_order( $orderID );
     89                        if( $corder ){
     90                            $corder->add_order_note( __( "HFD shipment cancelled", HFD_WC_EPOST ) );
     91                        }
     92                        $out = array( "success" => 0, "msg" => __( "HFD shipment cancelled", HFD_WC_EPOST ) );
     93                    }else if( isset( $api_response_run['Status'] ) && $api_response_run['Status'] == "ERROR" ){
     94                        $corder = wc_get_order( $orderID );
     95                        if( $corder ){
     96                            $corder->add_order_note( sprintf( __( "HFD shipment cancelled error : %s", HFD_WC_EPOST ), $api_response_run['Status_desc'] ) );
     97                        }
     98                        $out = array( "success" => 0, "msg" => $api_response_run['Status_desc'] );
     99                    }
     100                }
    76101            }else{
    77                 $api_response_run  = json_encode( $api_response_run );
    78                 $api_response_run = json_decode( $api_response_run, true );
    79                 update_post_meta( $orderID, 'hfd_ship_cancel_response', maybe_serialize( $api_response_run ) );
    80                 if( isset( $api_response_run['Status'] ) && $api_response_run['Status'] == "OK" ){
    81                     $corder = wc_get_order( $orderID );
    82                     if( $corder ){
    83                         $corder->add_order_note( __( "HFD shipment cancelled", HFD_WC_EPOST ) );
    84                     }
    85                     $out = array( "success" => 0, "msg" => __( "HFD shipment cancelled", HFD_WC_EPOST ) );
    86                 }else if( isset( $api_response_run['Status'] ) && $api_response_run['Status'] == "ERROR" ){
    87                     $corder = wc_get_order( $orderID );
    88                     if( $corder ){
    89                         $corder->add_order_note( sprintf( __( "HFD shipment cancelled error : %s", HFD_WC_EPOST ), $api_response_run['Status_desc'] ) );
    90                     }
    91                     $out = array( "success" => 0, "msg" => $api_response_run['Status_desc'] );
    92                 }
     102                $out = array( "success" => 0, "msg" => __( "Authorization token is required", HFD_WC_EPOST ) );
    93103            }
    94104        }

  • hfd-integration/trunk/hfd-woocommerce-epost.php

    r2451819 r2458311  
    44Plugin URI:
    55Description: Add shipping method of ePost, allowing the user on the checkout, to select the pickup location point from a google map popup. Also allows to synch the order to HFD API after the order is created.
    6 Version: 1.5.0
     6Version: 1.6.0
    77Author: HFD
    88Author URI: https://www.hfd.co.il

  • hfd-integration/trunk/languages/betanet_epost-he_IL.po

    r2420649 r2458311  
    33"Project-Id-Version: Betanet Epost\n"
    44"Report-Msgid-Bugs-To: \n"
    5 "POT-Creation-Date: 2020-09-22 14:26+0000\n"
    6 "PO-Revision-Date: 2020-09-22 14:26+0000\n"
     5"POT-Creation-Date: 2021-01-18 12:08+0000\n"
     6"PO-Revision-Date: 2021-01-18 12:09+0000\n"
    77"Last-Translator: \n"
    88"Language-Team: עִבְרִית\n"
    … …  
    1313"Content-Transfer-Encoding: 8bit\n"
    1414"X-Generator: Loco https://localise.biz/\n"
    15 "X-Loco-Version: 2.4.3; wp-5.5.1"
     15"X-Loco-Version: 2.4.3; wp-5.5.3"
    1616
    1717msgid "Branch name"
    … …  
    104104msgid "Company name"
    105105msgstr ""
     106
     107msgid "Authorization token is required"
     108msgstr "שגיאת אימות - עליך להוסיף טוקן"

  • hfd-integration/trunk/languages/betanet_epost.pot

    r2420649 r2458311  
    44"Project-Id-Version: Betanet Epost\n"
    55"Report-Msgid-Bugs-To: \n"
    6 "POT-Creation-Date: 2020-09-22 14:26+0000\n"
     6"POT-Creation-Date: 2021-01-18 12:08+0000\n"
    77"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    88"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    104104msgid "Company name"
    105105msgstr ""
     106
     107msgid "Authorization token is required"
     108msgstr ""

  • hfd-integration/trunk/readme.txt

    r2451819 r2458311  
    7575
    7676== Changelog ==
     77= 1.6 =
     78* הוספת אימות בעת בקשה לביטול משלוח
    7779= 1.5 =
    7880* תיקון שגיאת SSL נקודות איסוף
Note: See TracChangeset for help on using the changeset viewer.