[#137] Oprava různých notices

- Zachována kompatibilita pro WooCommerce verze 2.6.x (a starší).
pavelevap · May 10, 2017 · 6a1aa49 · 6a1aa49
1 parent 31dd88e
commit 6a1aa49
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 83 deletions.
diff --git a/includes/ceske-sluzby-functions.php b/includes/ceske-sluzby-functions.php
@@ -121,15 +121,22 @@ function ceske_sluzby_ziskat_nastavenou_dostupnost_produktu( $product, $dodatek
     return $dostupnost;
   }
   if ( get_class( $product ) == "WC_Product_Variation" ) {
-    $dodaci_doba_varianta = get_post_meta( $product->variation_id, 'ceske_sluzby_dodaci_doba', true );
+    $varianta_id = is_callable( array( $product, 'get_id' ) ) ? $product->get_id() : $product->id;
+    $dodaci_doba_varianta = get_post_meta( $varianta_id, 'ceske_sluzby_dodaci_doba', true );
     if ( empty ( $dodaci_doba_varianta ) ) {
-      $dodaci_doba_produkt = get_post_meta( $product->parent->id, 'ceske_sluzby_dodaci_doba', true );
+      if ( version_compare( WC_VERSION, '3.0', '<' ) ) {
+        $varianta_parent_id = $product->parent->id;
+      } else {
+        $varianta_parent_id = $product->get_parent_id();
+      }
+      $dodaci_doba_produkt = get_post_meta( $varianta_parent_id, 'ceske_sluzby_dodaci_doba', true );
     } else {
       $dodaci_doba_produkt = $dodaci_doba_varianta;
     }
   }
   elseif ( get_class( $product ) == "WC_Product_Simple" ) {
-    $dodaci_doba_produkt = get_post_meta( $product->id, 'ceske_sluzby_dodaci_doba', true );
+    $product_id = is_callable( array( $product, 'get_id' ) ) ? $product->get_id() : $product->id;
+    $dodaci_doba_produkt = get_post_meta( $product_id, 'ceske_sluzby_dodaci_doba', true );
   }
   if ( ! empty ( $dodaci_doba_produkt ) ) {
     $dostupnost = ceske_sluzby_ziskat_zadanou_dodaci_dobu( $dodaci_doba, $dodaci_doba_produkt );
@@ -158,7 +165,8 @@ function ceske_sluzby_ziskat_nastavenou_dostupnost_produktu( $product, $dodatek
 
 function ceske_sluzby_ziskat_predobjednavku( $product, $text ) {
   $dostupnost = "";
-  $predobjednavka = get_post_meta( $product->id, 'ceske_sluzby_xml_preorder_datum', true );
+  $product_id = is_callable( array( $product, 'get_id' ) ) ? $product->get_id() : $product->id;
+  $predobjednavka = get_post_meta( $product_id, 'ceske_sluzby_xml_preorder_datum', true );
   if ( ! empty ( $predobjednavka ) && $product->is_in_stock() ) {
     if ( (int)$predobjednavka >= strtotime( 'NOW', current_time( 'timestamp' ) ) ) {
       $predobjednavka = date_i18n( 'j.n.Y', $predobjednavka );
@@ -415,7 +423,11 @@ function ceske_sluzby_ziskat_dopravni_oblasti() {
   // http://www.ibenic.com/ultimate-guide-woocommerce-shipping-zones/
   $zones = array();
   $default_zone = WC_Shipping_Zones::get_zone( 0 );
-  $zone_id = $default_zone->get_zone_id();
+  if ( version_compare( WC_VERSION, '3.0', '<' ) ) {
+    $zone_id = $default_zone->get_zone_id();
+  } else {
+    $zone_id = $default_zone->get_id();;
+  }
   $zones[ $zone_id ] = $default_zone->get_data();
   $zones[ $zone_id ]['formatted_zone_location'] = $default_zone->get_formatted_location();
   $zones[ $zone_id ]['shipping_methods'] = $default_zone->get_shipping_methods();

diff --git a/includes/class-ceske-sluzby-eet.php b/includes/class-ceske-sluzby-eet.php
@@ -260,11 +260,7 @@ function ceske_sluzby_zpracovat_data_pro_eet_uctenky( $order_id ) {
     $eet_items = $order->get_items( 'ceske_sluzby_eet' );
     if ( ! empty( $eet_items ) && is_array( $eet_items ) ) {
       foreach ( $eet_items as $item_id => $item ) {
-        if ( version_compare( WC_VERSION, '3.0', '<' ) ) {
-          $response_data = $item['item_meta']['ceske_sluzby_eet_uctenka_response'][0];
-        } else {
-          $response_data = wc_get_order_item_meta( $item_id, 'ceske_sluzby_eet_uctenka_response' );
-        }
+        $response_data = wc_get_order_item_meta( $item_id, 'ceske_sluzby_eet_uctenka_response' );
         $response_xml = simplexml_load_string( $response_data );
         $chyba_text = $response_xml->children( 'soapenv', true )->Body->children( 'eet', true )->Odpoved->Chyba;
         if ( ! empty( $chyba_text ) ) {
@@ -288,11 +284,7 @@ function ceske_sluzby_zpracovat_data_pro_eet_uctenky( $order_id ) {
             }
           }
         }
-        if ( version_compare( WC_VERSION, '3.0', '<' ) ) {
-          $request_data = $item['item_meta']['ceske_sluzby_eet_uctenka_request'][0];
-        } else {
-          $request_data = wc_get_order_item_meta( $item_id, 'ceske_sluzby_eet_uctenka_request' );
-        }
+        $request_data = wc_get_order_item_meta( $item_id, 'ceske_sluzby_eet_uctenka_request' );
         $request_xml = simplexml_load_string( $request_data );
         $hlavicka = $request_xml->children( 'SOAP-ENV', true )->Body->children( 'ns1', true )->Trzba->Hlavicka->attributes();
         foreach ( $hlavicka as $key => $value ) {
@@ -442,11 +434,7 @@ public function ceske_sluzby_zobrazit_eet_uctenku_administrace( $order_id ) {
   }
 
   function ceske_sluzby_ziskat_eet_uctenku( $order ) {
-    if ( version_compare( WC_VERSION, '3.0', '<' ) ) {
-      $order_id = $order->id;
-    } else {
-      $order_id = $order->get_id();
-    }
+    $order_id = is_callable( array( $order, 'get_id' ) ) ? $order->get_id() : $order->id;
     // http://www.etrzby.cz/assets/cs/prilohy/EETServiceSOAP.wsdl
     $wsdl = dirname( dirname( __FILE__ ) ) . '/src/eet/EETServiceSOAP.wsdl';
     $heslo = "eet";
@@ -548,11 +536,7 @@ function ceske_sluzby_ziskat_eet_uctenku( $order ) {
   }
 
   public function ziskat_odeslane_danove_informace( $order ) {
-    if ( version_compare( WC_VERSION, '3.0', '<' ) ) {
-      $order_id = $order->id;
-    } else {
-      $order_id = $order->get_id();
-    }
+    $order_id = is_callable( array( $order, 'get_id' ) ) ? $order->get_id() : $order->id;
     $eet_uctenky = $this->ceske_sluzby_zpracovat_data_pro_eet_uctenky( $order_id );
     $dane = array();
     if ( ! empty( $eet_uctenky ) && is_array( $eet_uctenky ) ) {
@@ -590,11 +574,7 @@ public function ziskat_odeslane_danove_informace( $order ) {
   }
 
   public function ziskat_odeslanou_trzbu( $order ) {
-    if ( version_compare( WC_VERSION, '3.0', '<' ) ) {
-      $order_id = $order->id;
-    } else {
-      $order_id = $order->get_id();
-    }
+    $order_id = is_callable( array( $order, 'get_id' ) ) ? $order->get_id() : $order->id;
     $eet_uctenky = $this->ceske_sluzby_zpracovat_data_pro_eet_uctenky( $order_id );
     $celk_trzba = 0;
     if ( ! empty( $eet_uctenky ) && is_array( $eet_uctenky ) ) {

diff --git a/includes/class-ceske-sluzby-sledovani-zasilek.php b/includes/class-ceske-sluzby-sledovani-zasilek.php
@@ -174,7 +174,11 @@ public function render_meta_box_content( $post ) {
     }
     $id_zasilky = wc_get_order_item_meta( $item_id, 'ceske_sluzby_sledovani_zasilek_id_zasilky', true );
     $dopravce = wc_get_order_item_meta( $item_id, 'ceske_sluzby_sledovani_zasilek_dopravce', true );
-    $zeme_doruceni = $order->shipping_country;
+    if ( version_compare( WC_VERSION, '3.0', '<' ) ) {
+      $zeme_doruceni = $order->shipping_country;
+    } else {
+      $zeme_doruceni = $order->get_shipping_country();
+    }
     $dostupni_dopravci = ceske_sluzby_sledovani_zasilek_dostupni_dopravci( $zeme_doruceni );
 
     if ( ! empty( $id_zasilky ) && ! empty( $dopravce ) ) {