Changeset 2558913

Timestamp:

07/05/2021 04:56:11 PM (5 years ago)

Author:

phcwordpress

Message:

upd 20210705

Location:

drivefx-woocommerce/trunk

Files:

• PHCLibrary/invoices.php (modified) (1 diff)
• PHCLibrary/utils.php (modified) (1 diff)
• class.DriveFxWoocommerce.php (modified) (6 diffs)
• settings/syncro_gate.php (modified) (6 diffs)

drivefx-woocommerce/trunk/PHCLibrary/invoices.php

@@ -440 +440 @@
                 //Save id of customer
                 $_SESSION['numberClient'] = $response['result'][0]['no'];
+
+                //Set customer NIF if is generic customer
+                if($response['result'][0]['clivd'] == 1){
+                    $response['result'][0]['ncont'] = $dataPack->customer->ncont;
+                    $response['result'][0]['nome2'] = $dataPack->customer->nome;
+                }
+
+                #actEntity
+                $response = $this->utils_services->actEntity($ch, $credentials, 'FtWS', $response);
+
+                //$this->logs->writeFileLog('actEntity:', $response);
+
                 //Save Invoice
                 $response = $this->utils_services->paramsSave($ch, $credentials, 'FtWS', $response);

drivefx-woocommerce/trunk/PHCLibrary/utils.php

@@ -712 +712 @@
 
     /*******************************************************************
-    *             ---  Get Recent Internal Document ---                *
+    *                   ---  check VAT via VIES ---                    *
     ********************************************************************/
     function viesCheckVAT($countryCode, $vatNumber, $timeout = 30) {

drivefx-woocommerce/trunk/class.DriveFxWoocommerce.php

@@ -1517 +1517 @@
             //Manage stock & send Email to customer
             $this->manageStock($ch, $credentials, $response);
-            $this->sendEmail($ch, $credentials, $response);
+            $this->sendEmail($ch, $credentials, $response, $dataPack);
 
             $this->logs->writeFileLog('addInternalDocumentInvoice', "sai addInternalDocumentInvoice ft:" . $order_id);
@@ -1534 +1534 @@
             //Manage stock & send Email to customer
             $this->manageStock($ch, $credentials, $response);
-            $this->sendEmail($ch, $credentials, $response);
+            $this->sendEmail($ch, $credentials, $response, $dataPack);
 
             $this->logs->writeFileLog('addSimpleft', "Sai simple ft:" . $orderid);
@@ -1605 +1605 @@
 
         // Send E-mail
-        public function sendEmail($ch, $credentials, $response){
+        public function sendEmail($ch, $credentials, $response, $dataPack){
             $settings = get_option(DRIVEFXWOOCOMMERCE_PLUGIN_NAME);
 
@@ -1645 +1645 @@
                     if($sendEmail == true){
                         //Obtain client
-                        $response = $this->utils_services->filterItem_Query($ch, $credentials, 'Cl', 'no', $_SESSION['numberClient']);
-
-                        //$this->logs->writeFileLog('custom_by_no:', $response);
+                        /* $response = $this->utils_services->filterItem_Query($ch, $credentials, 'Cl', 'no', $_SESSION['numberClient']);
+
+                        $this->logs->writeFileLog('custom_by_no:', $response);
 
                         if (curl_error($ch)) {
@@ -1655 +1655 @@
                         } else if(isset($response['messages'][0]['messageCodeLocale'])){
                             $this->logs->writeFileLog('addSimpleFT18', $response['messages'][0]['messageCodeLocale']);
-                        } else {
-                            if($response['result'][0]['email'] != ''){
+                        } else { */
+                            //if($response['result'][0]['email'] != ''){
+                            if($dataPack->customer->email != ''){
                                 //Email To
-                                $_SESSION['emailClient'] = $response['result'][0]['email'];
+                                //$_SESSION['emailClient'] = $response['result'][0]['email'];
+                                $_SESSION['emailClient'] = $dataPack->customer->email;
                                 //Email From
                                 $infoAdmin = $this->get_settingsAdmin();
@@ -1684 +1686 @@
                             }
                         }
-                    }
+                    //}
                 }
             }

drivefx-woocommerce/trunk/settings/syncro_gate.php

@@ -74 +74 @@
             //get NIF name field (billing) from backendinfo
             $ft_nifName = '_billing_'.$settings['backend']['fieldNif'];
+
+            //$this->logs->writeFileLog('ft_nifName', $ft_nifName);
 
             //get NIF name field (shipping) from backendinfo
@@ -271 +273 @@
                 $syncroData->taxCountry = $wpdb->get_var( $wpdb->prepare( "SELECT tax_rate_country FROM ".$wpdb->prefix."woocommerce_tax_rates WHERE tax_rate_name='".$getTaxName."' LIMIT 1" ) );
 
+
+            /*******************************************************************
+            *               --- Alternative select Data  ---                   *
+            ********************************************************************/
+
+               /* if some data is no0t received from webhook or order object
+                       here we fount alternative methods (like for create invoice process)*/
+
                 #nextPostId
                 global $wpdb;
@@ -280 +290 @@
                 //Save nextPostId
                 $syncroData->nextPostId = $packDocId->nextPostId;
+
+                if(empty($raw_order)){
+                    #get alternative stdClass Object data
+                    $table = $wpdb->prefix . 'postmeta';
+                    $sql = 'SELECT * FROM `'. $table . '` WHERE post_id = '. $syncroData->nextPostId;
+                    $resultStdClass = $wpdb->get_results($sql);
+
+                    //$this->logs->writeFileLog('resultStdClass', $resultStdClass);
+
+                    foreach($resultStdClass as $res) {
+                        if(empty($syncroData->billing_email)) {
+                            if( $res->meta_key == '_billing_email'){
+                                $syncroData->billing_email = $res->meta_value; // get customer email
+                            }
+                        }
+                        if(empty($syncroData->ft_nifName)) {
+                            if( $res->meta_key == $ft_nifName){
+                                $syncroData->ft_nifName = $res->meta_value; // get customer nif
+                            }
+                        }
+                        if(empty($syncroData->billing_address_1)) {
+                            if( $res->meta_key == '_billing_address_1'){
+                                $syncroData->billing_address_1 = $res->meta_value; // get customer address
+                            }
+                        }
+                        if(empty($syncroData->billing_first_name)) {
+                            if( $res->meta_key == '_billing_first_name'){
+                                $syncroData->billing_first_name = $res->meta_value; // get customer name
+                            }
+                        }
+                        if(empty($syncroData->billing_last_name)) {
+                            if( $res->meta_key == '_billing_last_name'){
+                                $syncroData->billing_last_name = $res->meta_value; // get customer surname
+                            }
+                        }
+                    }
+                }
 
             /*******************************************************************
@@ -403 +450 @@
                 #get country for Ft
                 $order_meta = get_post_meta($order_id);
+
+                //$this->logs->writeFileLog('order_meta', $order_meta);
 
                 $syncroData->$bill_country_ft = $order_meta['_billing_country'][0];
@@ -850 +899 @@
             $bill->telefone = $wooOrder->billing_phone;
             $bill->codpost = $wooOrder->billing_postcode;
-            $bill->ncont = $wooOrder->billing_nif_ft;
+            $bill->ncont = $wooOrder->ft_nifName;
 
             # shipping data
@@ -873 +922 @@
             $customer->telefone = $wooOrder->billing_phone;
             $customer->codpost = $wooOrder->billing_postcode;
-            $customer->ncont = $wooOrder->billing_nif_ft;
+            $customer->ncont = $wooOrder->ft_nifName;
             $customer->preco = $wooOrder->productPriceColumn;
             $customer->country = $wooOrder->billing_country;