Changeset 2092492

Timestamp:

05/21/2019 05:01:51 PM (7 years ago)

Author:

phcwordpress

Message:

4.5.9 - Taxas IVA Fix

Location:

drivefx-woocommerce/trunk

Files:

• class.DriveFxWoocommerce.php (modified) (6 diffs)
• drivefx-woocommerce.php (modified) (1 diff)

drivefx-woocommerce/trunk/class.DriveFxWoocommerce.php

@@ -2260 +2260 @@
                                                     } else {
                                                     
-                                                        //Obtain name and price of delivery
+                                                        //Obtain name and price of delivery
                                                             //Put the same number of order in Drive FX
                                                         global $wpdb;
@@ -2281 +2281 @@
                                                         }
 
-                                                                
+                                                        //get taxes from drive fx
+                                                        $url = $settings['backend']['url'] . $this->extraurl . "/REST/SearchWS/QueryAsEntities";
+                                                                                                                
+                                                                                                                
+                                                        $params =  array('itemQuery' => '{"distinct": true,
+                                                                                "groupByItems": [],
+                                                                                "orderByItems": [
+                                                                                    {
+                                                                                        "OrderItem": "dataini",
+                                                                                        "OrderType": 1
+                                                                                    }
+                                                                                    ],
+                                                                                "SelectItems": [],
+                                                                                "entityName": "TaxasIVA",
+                                                                                "filterItems": [],
+                                                                                "joinEntities": []
+                                                                            }'
+                                                                    );
+                                                        
+                                                        $queryActEntity = http_build_query($params);
+                                                        curl_setopt($ch, CURLOPT_URL, $url);
+                                                        curl_setopt($ch, CURLOPT_POST, false);
+                                                        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+                                                        curl_setopt($ch, CURLOPT_POSTFIELDS, $queryActEntity);
+                                                        curl_setopt($ch, CURLOPT_ENCODING, 'UTF-8');
+                                                        $responseQueryAsEntities = curl_exec($ch);
+
+                                                        
+                                                        $responseQueryAsEntities = json_decode($responseQueryAsEntities, true);
+                                            
+                                                            
                                                         $table_name = $wpdb->prefix."woocommerce_order_items"; 
                                                         $query = "SELECT * FROM %s WHERE order_id = %s and order_item_type = 'shipping'";
                                                         $resultShipping = $wpdb->get_row(str_replace("'".$table_name."'", $table_name, $wpdb->prepare($query, $table_name, $docid->nextPostId)));
                                                         
+                                                        //get tax value for shipping
+                                                        $table_name = $wpdb->prefix."woocommerce_order_itemmeta"; 
+                                                        $query = "SELECT * FROM %s WHERE order_item_id = %s and meta_key = 'total_tax'";
+                                                        $resultTax = $wpdb->get_row(str_replace("'".$table_name."'", $table_name, $wpdb->prepare($query, $table_name, $resultShipping->order_item_id)));        
+    
                                                         $table_name = $wpdb->prefix."woocommerce_order_itemmeta"; 
                                                         $query = "SELECT * FROM %s WHERE order_item_id = %s and meta_key = 'cost'";
-                                                        $resultDB = $wpdb->get_row(str_replace("'".$table_name."'", $table_name, $wpdb->prepare($query, $table_name, $resultShipping->order_item_id)));     
-
+                                                        $resultDB = $wpdb->get_row(str_replace("'".$table_name."'", $table_name, $wpdb->prepare($query, $table_name, $resultShipping->order_item_id)));
+         
 
                                                         //Obtain VO with updated Bo
@@ -2315 +2350 @@
                                                             }
                                                         }
-
-                                                        $bi= new stdClass();
+                                        foreach ($_SESSION['listOfSku'] as $key => $value) {    
+                                                            
+                                                            //shipping
+                                                            $bi= new stdClass();
+                                                            $bi->design = $resultShipping->order_item_name;
+                                                            $bi->qtt = 1;
+                                                            $bi->edebito = $bi->ettdeb = $resultDB->meta_value;
+                                                            if($settings['backend']['includeTaxonSendCost']=="true") {
+                                                                 $bi->ivaincl=true;
+                                                            }
+                                                                                                                    
+
+                                                            // get IVA
+                                                            foreach ($responseQueryAsEntities['result'] as $tax) {
+                                                            if ($resultTax->total_tax == $tax['taxa'] && 'PT' == $tax['regiao']) {
+                                                                        $bi->iva = $tax['taxa'];
+                                                                    $bi->tabiva = $tax['codigo'];       
+                                                        }
+                                                        }
+                                                            if($bi->edebito == 0){
+                                                                $bi->qtt = 0;
+                                                                $bi->ivaincl = false;
+                                                                }   
+                                                            $response['result'][0]['bis'][]= $bi;       
+                                                }
+
+                                              //shipping - OLD version : 
+                                            /*          $bi= new stdClass();
                                                         $bi->design = $resultShipping->order_item_name;;
                                                         $bi->qtt = 1;
@@ -2323 +2384 @@
                                                             $bi->ivaincl=true;
                                                         }
-                                                        
+                                                        //TODO get IVA
                                                         if($bi->edebito == 0){
                                                             $bi->qtt = 0;
@@ -2329 +2390 @@
                                                         }   
                                                         
-                                                        $response['result'][0]['bis'][]= $bi;
-                                                        
-                                                
+                                                        $response['result'][0]['bis'][]= $bi;  */
+                                            
+                                                      
                                                         
                                                         $urlBo = $settings['backend']['url'] . $this->extraurl . "/REST/BoWS/actEntity";
@@ -2567 +2628 @@
                                                                             //get product tax rate country
                                                                             $getTaxCountry = $wpdb->get_var( $wpdb->prepare( "SELECT tax_rate_country FROM ".$wpdb->prefix."woocommerce_tax_rates WHERE tax_rate_class='%s' LIMIT 1", $getProduct->get_tax_class() ) );
-                                                                        
+                                                                    
                                                                             foreach ($responseQueryAsEntities['result'] as $tax) {
                                                                                 

drivefx-woocommerce/trunk/drivefx-woocommerce.php

@@ -3 +3 @@
  * Plugin Name: Drive FX WooCommerce
  * Description: Easy integration between Woocommerce WordPress and your Drive FX installation.
- * Version: 4.5.8
+ * Version: 4.5.9
  * Author: PHC Software, S.A.
  * Author URI: https://www.drivefx.net/