From c6e890a13893637baa35b3838b5072023044d2ce Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 1 Mar 2018 07:54:33 +0100 Subject: [PATCH] Version 0.4.7 --- admin/CargonizerOptions.php | 11 ++++++----- include/api/CargonizerApi.php | 3 ++- include/controllers/ConsignmentController.php | 2 +- woocommerce-cargonizer.php | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/admin/CargonizerOptions.php b/admin/CargonizerOptions.php index ccc8de0..e0f65e6 100644 --- a/admin/CargonizerOptions.php +++ b/admin/CargonizerOptions.php @@ -302,12 +302,13 @@ function getTransportAgreements($force_update=false){ if ( !$transport_agreements or $force_update ){ _log('update transport agreements'); $Api = new CargonizerApi(true); - $agreements = $Api->TransportAgreements->xpath('/transport-agreements/transport-agreement'); + if ( is_object($Api) && isset($Api->TransportAgreements) ){ + $agreements = $Api->TransportAgreements->xpath('/transport-agreements/transport-agreement'); - if ( $ta = $this->extractTransportAgreements($agreements) ){ - $this->saveTransportAgreements( $ta ); - - $transport_agreements = $ta; + if ( $ta = $this->extractTransportAgreements($agreements) ){ + $this->saveTransportAgreements( $ta ); + $transport_agreements = $ta; + } } } diff --git a/include/api/CargonizerApi.php b/include/api/CargonizerApi.php index 66071aa..94b850f 100644 --- a/include/api/CargonizerApi.php +++ b/include/api/CargonizerApi.php @@ -102,7 +102,8 @@ function postConsignment($xml){ 'Content-Type' => 'application/xml' ); - return $this->rest('consignments.xml', $headers, 'POST', $xml, $debug=false, $force_response=true ); + _log($xml); + return $this->rest('consignments.xml', $headers, 'POST', $xml, $debug=true, $force_response=true ); } diff --git a/include/controllers/ConsignmentController.php b/include/controllers/ConsignmentController.php index feea805..472c126 100644 --- a/include/controllers/ConsignmentController.php +++ b/include/controllers/ConsignmentController.php @@ -61,7 +61,7 @@ public static function createConsignment( $post_id ){ $CargonizeXml = new CargonizeXml( $Consignment->prepareExport() ); $CargonizerApi = new CargonizerApi(); $result = null; - _log('post consignment'); + $result = $CargonizerApi->postConsignment($CargonizeXml->Xml); if ( $result ){ // check if response is object diff --git a/woocommerce-cargonizer.php b/woocommerce-cargonizer.php index 4537dd9..947a8a4 100644 --- a/woocommerce-cargonizer.php +++ b/woocommerce-cargonizer.php @@ -2,7 +2,7 @@ /*woo Plugin Name: Woocommerce Cargonizer Description: -Version: 0.4.6 +Version: 0.4.7 Author: Mediebruket AS Author URI: http://mediebruket.no */