Merge pull request #18 from Codaone/Branch-1.1.0

Branch 1.1.0
Codaone · May 5, 2017 · b670a9f · b670a9f
2 parents 758fc0a + e9d452a
commit b670a9f
Show file tree

Hide file tree

Showing 2 changed files with 226 additions and 193 deletions.
diff --git a/includes/class-logitrail-shipping.php b/includes/class-logitrail-shipping.php
@@ -194,27 +194,21 @@ public function init_form_fields() {
      * @return void
      */
     public function calculate_shipping( $package = Array() ) {
-    	global $woocommerce;
-
-		$shipping_methods = array('pickup' => 'Nouto', 'letter' => 'Kirje', 'home' => 'Ovelle');
-		$title = $this->settings['title'];
-		$unique_id = $woocommerce->session->get_customer_id();
-		if($title == '') {
-			$type = get_transient('logitrail_' . $unique_id . '_type');
-			$title = ($type && array_key_exists($type, $shipping_methods) ? $shipping_methods[$type] : 'Toimitustapaa ei ole valittu');
-		}
+        $shipping_methods = array('pickup' => 'Nouto', 'letter' => 'Kirje', 'home' => 'Ovelle');
+        $title = $this->settings['title'];
+        if($title == '') {
+            $type = WC()->session->get('type');
+            $title = ($type && array_key_exists($type, $shipping_methods) ? $shipping_methods[$type] : 'Toimitustapaa ei ole valittu');
+        }
 
-        $postage = get_transient('logitrail_' . $unique_id . '_price');
+        $postage = WC()->session->get('price');
         $this->add_rate( array(
-                'id' 	=> $this->id . '_postage',
+                'id'    => $this->id . '_postage',
                 'label' => $title,
-				'cost' 	=> $postage,
+                'cost'  => $postage,
                 'sort'  => 0
         ) );
 
-        $debug_mode = ($this->settings['debug_mode'] === 'yes' ? true : false);
-        if($debug_mode) {
-            Logitrail_WooCommerce::logitrail_debug_log('Informing WooCommerce postage as ' . $postage);
-        }
+        Logitrail_WooCommerce::logitrail_debug_log('Informing WooCommerce postage as ' . $postage);
     }
 }