Changeset 2578312

Timestamp:

08/04/2021 06:38:40 PM (4 years ago)

Author:

appmaxplataforma

Message:

Validando e realizando envio de valores personalizados pro produto.

Location:

appmax-woocommerce

Files:

• assets/banner-1544x500.png (modified) (previous)
• assets/banner-772x250.png (modified) (previous)
• assets/icon-128x128.png (modified) (previous)
• assets/icon-256x256.png (modified) (previous)
• trunk/appmax-woocommerce.php (modified) (3 diffs)
• trunk/includes/class-awc-api.php (modified) (7 diffs)
• trunk/includes/class-awc-interest.php (added)
• trunk/includes/class-awc-tax.php (added)
• trunk/readme.txt (modified) (2 diffs)

appmax-woocommerce/trunk/appmax-woocommerce.php

@@ -3 +3 @@
  * Plugin Name: AppMax WooCommerce
  * Description: Gateway de pagamento AppMax para WooCommerce.
- * Version: 2.0.40
+ * Version: 2.0.41
  * License: GPLv2 or later
  * Author: AppMax Plataforma de Vendas Ltda
@@ -24 +24 @@
     class AppMax_WC
     {
-        const VERSION = '2.0.40';
+        const VERSION = '2.0.41';
 
         /**
@@ -179 +179 @@
             include_once AWC_ABSPATH . '/includes/class-awc-gateway-credit-card.php';
             include_once AWC_ABSPATH . '/includes/class-awc-helper.php';
+            include_once AWC_ABSPATH . '/includes/class-awc-interest.php';
             include_once AWC_ABSPATH . '/includes/class-awc-post-payment.php';
             include_once AWC_ABSPATH . '/includes/class-awc-process-payment.php';
             include_once AWC_ABSPATH . '/includes/class-awc-search-gateway.php';
+            include_once AWC_ABSPATH . '/includes/class-awc-tax.php';
+            include_once AWC_ABSPATH . '/includes/class-awc-tracking-code.php';
             include_once AWC_ABSPATH . '/includes/class-awc-validation.php';
             include_once AWC_ABSPATH . '/includes/class-awc-webhook.php';
             include_once AWC_ABSPATH . '/includes/class-awc-webhook-post.php';
-            include_once AWC_ABSPATH . '/includes/class-awc-tracking-code.php';
         }
 

appmax-woocommerce/trunk/includes/class-awc-api.php

@@ -115 +115 @@
      * @param $interest_total
      * @return array|WP_Error
+     * @throws Exception
      */
     public function awc_post_order( $customer_id, $interest_total )
@@ -207 +208 @@
         return array(
             'Content-Type' => 'application/json; charset=utf-8',
-            'access-token' => $this->gateway->awc_api_key
+            'access-token' => $this->gateway->awc_api_key,
         );
     }
@@ -249 +250 @@
         $array_products = [];
 
-        foreach ($items as $item => $values) {
+        foreach ($items as $values) {
             array_push( $array_products, $this->awc_get_current_product( $values ) );
         }
 
-        $array_products = $this->awc_distribute_interest( $array_products, $interest );
+        $array_products = (new AWC_Interest())->awc_distribute_interest( $array_products, $interest );
 
         $tax_total = (float) AWC_Helper::awc_get_fee_total();
@@ -261 +262 @@
         }
 
-        return $this->awc_distribute_tax( $array_products, $interest );
-    }
-
-    private function awc_distribute_interest( $products, $interest )
-    {
-        $distribute_interest = (float) round(($interest / count($products)), 3);
-
-        return array_map(function($item) use ($distribute_interest) {
-            $price = $item['price'] + ($distribute_interest / $item['qty']);
-            $item['price'] = round($price, 3);
-            return $item;
-        }, $products);
-    }
-
-    private function awc_distribute_tax( $products, $interest )
-    {
-        $tax_total = (float) AWC_Helper::awc_get_fee_total();
-
-        $distribute_tax = round(($tax_total / count($products)), 3);
-
-        $new_products = array_map(function($item) use ($distribute_tax) {
-            $price = $item['price'] + ($distribute_tax / $item['qty']);
-            $item['price'] = round($price, 3);
-            return $item;
-        }, $products);
-
-        $total_sum_products = $this->awc_get_total_sum_products( $new_products );
-
-        $discount = (float) number_format( AWC_Helper::awc_get_discount_total(), 2, '.', ',' );
-
-        $total_cart = (float) AWC_Helper::awc_get_total_cart();
-
-        $difference = (float) round((($total_sum_products - $discount - $interest) - $total_cart), 2);
-
-        if ($difference == 0.00) {
-            return $new_products;
-        }
-
-        uasort($new_products, function($a, $b) {
-            if ($a['price'] == $b['price']) {
-                return 0;
-            }
-            return ($a['price'] < $b['price']) ? 1 : -1;
-        });
-
-        $new_products = array_values($new_products);
-
-        foreach ($new_products as $key => $product) {
-            if ($product['qty'] == 1) {
-                $new_products[$key]['price'] -= $difference;
-                break;
-            }
-            if ($product['qty'] > 1) {
-                $new_products[$key]['price'] -= $difference / $product['qty'];
-                break;
-            }
-        }
-
-        return $new_products;
-    }
-
-    private function awc_get_total_sum_products( $products )
-    {
-        return array_reduce($products, function($total, $item) {
-            $total += (float) ($item['price'] * $item['qty']);
-            return $total;
-        });
+        return (new AWC_Tax())->awc_distribute_tax( $array_products, $interest );
+    }
+
+    /**
+     * @param $values
+     * @return array
+     * @throws Exception
+     */
+    private function awc_get_current_product( $values )
+    {
+        $product = wc_get_product( $values['product_id'] );
+
+        if ( ! $product->get_sku() ) {
+            throw new \Exception( "Produto do carrinho {$product->get_title()} não possui SKU registrado." );
+        }
+
+        if ( empty( $values['variation_id'] ) && count( $values['variation'] ) == 0 ) {
+            return $this->awc_get_information_product( $product, $values );
+        }
+
+        return $this->awc_get_information_product_variation( $product->get_sku(), $values );
+    }
+
+    /**
+     * @param WC_Product $product
+     * @param $values
+     * @return array
+     */
+    private function awc_get_information_product( WC_Product $product, $values )
+    {
+        $price = (float) $product->get_price();
+
+        if ( ! empty( $values['rn_entry'] ) ) {
+            $totals = $values['rn_entry']->Totals;
+
+            $price = (float) $product->get_price() + $totals->OptionsTotal;
+        }
+
+        return [
+            "sku" => $product->get_sku(),
+            "price" => $price,
+            "name" => $product->get_title(),
+            "qty" => $values['quantity'],
+            "description" => $product->get_description(),
+            "image" => get_the_post_thumbnail_url( $values['product_id'] ),
+        ];
     }
 
@@ -339 +319 @@
         $variation = wc_get_product( $values['variation_id'] );
 
+        $price = (float) $variation->get_price();
+
+        if ( ! empty( $values['rn_entry'] ) ) {
+            $totals = $values['rn_entry']->Totals;
+
+            $price = (float) $variation->get_price() + $totals->OptionsTotal;
+        }
+
         return [
             "sku" => "{$skuParentProduct}__{$variation->get_sku()}",
-            "price" => (float) $variation->get_price(),
+            "price" => $price,
             "name" => $variation->get_name(),
             "qty" => $values['quantity'],
@@ -350 +338 @@
 
     /**
-     * @param WC_Product $product
-     * @param $values
-     * @return array
-     */
-    private function awc_get_information_product( WC_Product $product, $values )
-    {
-        return [
-            "sku" => $product->get_sku(),
-            "price" => (float) $product->get_price(),
-            "name" => $product->get_title(),
-            "qty" => $values['quantity'],
-            "description" => $product->get_description(),
-            "image" => get_the_post_thumbnail_url( $values['product_id'] ),
-        ];
-    }
-
-    /**
-     * @param $values
-     * @return array
-     * @throws Exception
-     */
-    private function awc_get_current_product( $values )
-    {
-        $product = wc_get_product( $values['product_id'] );
-
-        if ( ! $product->get_sku() ) {
-            throw new \Exception( "Produto do carrinho {$product->get_title()} não possui SKU registrado." );
-        }
-
-        if ( empty( $values['variation_id'] ) && count( $values['variation'] ) == 0 ) {
-            return $this->awc_get_information_product( $product, $values );
-        }
-
-        return $this->awc_get_information_product_variation( $product->get_sku(), $values );
-
-    }
-
-    /**
      * @param $order_id
      * @param $tracking_code
@@ -398 +348 @@
         return $this->awc_post( $this->awc_get_full_url( AWC_Suffix_Api::AWS_SUFFIX_TRACKING_CODE ), $data );
     }
-
 
     /**

appmax-woocommerce/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.0
 Tested up to: 5.1
-Stable tag: 2.0.40
+Stable tag: 2.0.41
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -117 +117 @@
 == Changelog ==
 
+= 2.0.41 =
+
+* Permitido envio de valores personalizados ao produto através da extensão do Woocommerce Extra Product Options Builder for WooCommerce.
+
 = 2.0.40 =