Changeset 3105158

Timestamp:

06/20/2024 01:53:32 PM (3 weeks ago)

Author:

bastho

Message:

Merge branch 'v1.6.4' into 'master'

File:

• accounting-for-woocommerce/trunk/inc/export.php (modified) (2 diffs)

accounting-for-woocommerce/trunk/inc/export.php

@@ -109 +109 @@
         $gateways_libs = get_option('woocommerce_accounting_gateways_libs');
         $lib_prefix = get_option ('woocommerce_accounting_lib_prefix');
+
+
     }
 
     foreach ($orders as $wcOrder)
     {
+
+
+
+
         $order = (object) array();
         $order->WCOrder = $wcOrder;
@@ -638 +644 @@
                 $wc_order = wc_get_order($order->ID);
                 $order->countryid = $wc_order->get_billing_country();
-                $order_country_acc = get_option('woocommerce_accounting_countries_acc');
-                $country_account_prod = $order_country_acc[$order->countryid]['acc'];
-                if (empty($country_account_prod)) {
-                    $country_account_prod = $gen_account_prod;
+                $country_account_prod = $gen_account_prod;
+                if (!empty($order_country_acc[$order->countryid]['acc'])) {
+                    $country_account_prod = $order_country_acc[$order->countryid]['acc'];
                 }
                 if (round($order->income_prodht, $rounding_precision) > 0) {