Changeset 1424199

Timestamp:

05/25/2016 05:17:57 PM (10 years ago)

Author:

JohnnyPea

Message:

v1.5.5

File:

• woocommerce-superfaktura/trunk/class-wc-superfaktura.php (modified) (5 diffs)

woocommerce-superfaktura/trunk/class-wc-superfaktura.php

@@ -24 +24 @@
      * @var     string
      */
-    protected $version = '1.5.4';
+    protected $version = '1.5.5';
 
     /**
@@ -249 +249 @@
     }
 
-    public function sf_clean_invoice_items($order, $api)
-    {
-        $invoice_id = (int)get_post_meta($order->id, 'wc_sf_internal_id', true);
+    public function sf_clean_invoice_items($invoice_id, $api)
+    {
         $response = $api->invoice($invoice_id);
         if(!isset($response->error) || $response->error==0)
@@ -265 +264 @@
     public function sf_new_invoice($order_id)
     {
+        $order = new WC_Order($order_id);
+
+        foreach( array('regular','proforma') as $type )
+        {
+            if ( ! $invoice_status = $this->generate_invoice_status($order->payment_method,$type) )
+                continue;
+
+            if ( $invoice_status != $order->status )
+                continue;
+
+            $this->sf_generate_invoice( $order, $type );
+        }
+    }
+
+    private function sf_generate_invoice( $order, $type ) {
         $edit = false;
-        $order = new WC_Order($order_id);
         $api = $this->sf_api();
 
-        $sf_id = get_post_meta($order->id, 'wc_sf_internal_id', true);
+        $sf_id = get_post_meta($order->id, 'wc_sf_internal_' . $type . '_id', true);
+
+        // plugin-update checking code
+        if ( ! $sf_id ) {
+            $old_sf_id = get_post_meta( $order->id, 'wc_sf_internal_id', true );
+            if ( $old_sf_id ) {
+                // if there is generated regular invoice (link), then it's regular id
+                if ( get_post_meta( $order->id, 'wc_sf_invoice_regular', true ) ) {
+                    update_post_meta( $order->id, 'wc_sf_internal_regular_id', $old_sf_id );
+                    // use only if we are generating regular invoice
+                    if ( 'regular' === $type ) {
+                        $sf_id = $old_sf_id;
+                    }
+                }
+                // else if there is generated proforma invoice (link), then it's proforma id
+                elseif ( get_post_meta( $order->id, 'wc_sf_invoice_proforma', true ) ) {
+                    update_post_meta( $order->id, 'wc_sf_internal_proforma_id', $old_sf_id );
+                    // use only if we are generating proforma invoice
+                    if ( 'proforma' === $type ) {
+                        $sf_id = $old_sf_id;
+                    }
+                }
+            }
+        }
+        // ---------------------------
+
         if(!empty($sf_id))
         {
@@ -275 +313 @@
                 return false;
 
-            $this->sf_clean_invoice_items($order, $api);
+            $this->sf_clean_invoice_items($sf_id, $api);
             $edit = true;
         }
@@ -512 +550 @@
         }
 
-        foreach( array('regular','proforma') as $type )
-        {
-            if ( ! $invoice_status = $this->generate_invoice_status($order->payment_method,$type) )
-                continue;
-
-            if ( $invoice_status != $order->status )
-                continue;
+        if($edit)
+        {
+            $api->setInvoice(array(
+                'type' => $type,
+                'id' => $sf_id,
+            ));
+
+            $response = $api->edit();
+        }
+        else
+        {
+            $invoice_id = get_option('woocommerce_sf_invoice_custom_num')=='yes' ? $this->generate_invoice_id($order,$type) : '';
+
+            $api->setInvoice(array(
+                'type' => $type,
+                'invoice_no_formatted' => $invoice_id,
+            ));
+
+            $response = $api->save();
+        }
+
+        if( $response->error === 0 )
+        {
+            $internal_id = $response->data->Invoice->id;
+
+            update_post_meta($order->id, 'wc_sf_internal_' . $type . '_id', $internal_id);
+
+            $pdf = $api::SFAPI_URL.'/invoices/pdf/'.$internal_id.'/token:'.$response->data->Invoice->token;
+
+            update_post_meta($order->id, 'wc_sf_invoice_'.$type, $pdf);
 
             if($edit)
             {
-                $api->setInvoice(array(
-                    'type' => $type,
-                    'id' => (int)get_post_meta($order->id, 'wc_sf_internal_id', true)
-                ));
-
-                $response = $api->edit();
-            }
-            else
-            {
-                $invoice_id = get_option('woocommerce_sf_invoice_custom_num')=='yes' ? $this->generate_invoice_id($order,$type) : '';
-
-                $api->setInvoice(array(
-                    'type' => $type,
-                    'invoice_no_formatted' => $invoice_id,
-                ));
-
-                $response = $api->save();
-            }
-
-            if( $response->error === 0 )
-            {
-                $internal_id = $response->data->Invoice->id;
-
-                update_post_meta($order->id, 'wc_sf_internal_id', $internal_id);
-
-                $pdf = $api::SFAPI_URL.'/invoices/pdf/'.$internal_id.'/token:'.$response->data->Invoice->token;
-
-                update_post_meta($order->id, 'wc_sf_invoice_'.$type, $pdf);
-
-                if($edit)
-                {
-
-                }
-            }
-            else
-            {
-                $pdf = $order->get_view_order_url(); //?
-            }
+
+            }
+        }
+        else
+        {
+            $pdf = $order->get_view_order_url(); //?
         }
     }