WordPress.org
Get WordPress

Plugin Directory

Changeset 3294841


Ignore:
Timestamp:
05/16/2025 02:41:25 PM (11 months ago)
Author:
minicrmio
Message:

Improved handling of orders to companies

Location:
minicrm-woocommerce-sync/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • minicrm-woocommerce-sync/trunk/languages/minicrm-woocommerce-sync.pot

    r3262157 r3294841  
    44"Project-Id-Version: MiniCRM "
    55"WooCommerce Sync plugin "
    6 "v1.7.0\n"
     6"v1.7.1\n"
    77"POT-Creation-Date: 2022-05-30 "
    88"22:22+0200\n"

  • minicrm-woocommerce-sync/trunk/lib/Feed.php

    r3102566 r3294841  
    335335                self::_addExtraProductOptions ($order_project, $order_obj);
    336336
    337                 $name = self::_getCustomerName ($locale, $order_obj);
     337                $name = self::_getCustomer($locale, $order_obj);
    338338                $customer->Name = $name;
    339339
    … …  
    614614
    615615        // Prepend company if available
     616        $company = self::_getCustomerCompany ($order);
     617
     618        if ($company) {
     619
     620            // Company + customer name
     621            if ($customer_name) {
     622                return "$company ($customer_name)";
     623            }
     624
     625            // Company only
     626            return $company;
     627        }
     628
     629        // Customer name only
     630        return $customer_name;
     631    }
     632
     633    protected static function _getCustomerCompany (\WC_Order $order): string
     634    {
    616635        $company = $order->get_billing_company ();
    617636        if (!$company) {
    618637            $company = $order->get_shipping_company ();
    619638        }
     639
     640        return $company;
     641    }
     642
     643    protected static function _getCustomer (
     644        string $locale,
     645        \WC_Order $order
     646    ): string
     647    {
     648        $company = self::_getCustomerCompany ($order);
     649
    620650        if ($company) {
    621 
    622             // Company + customer name
    623             if ($customer_name) {
    624                 return "$company ($customer_name)";
    625             }
    626 
    627             // Company only
    628651            return $company;
    629652        }
    630653
    631         // Customer name only
     654        $customer_name = self::_getCustomerName ($locale, $order);
     655
    632656        return $customer_name;
    633657    }

  • minicrm-woocommerce-sync/trunk/lib/Integration.php

    r3262157 r3294841  
    9494    {
    9595        // Try to get cached data first
    96         $cached_project_ids = get_transient('minicrm_project_ids_cache');
    97         if ($cached_project_ids !== false) {
    98             return $cached_project_ids;
     96        if (self::isDebuggingEnabled() === false) {
     97            $cached_project_ids = get_transient('minicrm_project_ids_cache');
     98            if ($cached_project_ids !== false) {
     99                return $cached_project_ids;
     100            }
    99101        }
    100102
    … …  
    122124
    123125        // Cache the results for 1 hour
    124         set_transient('minicrm_project_ids_cache', $projectIds, 1 * HOUR_IN_SECONDS);
     126        if (self::isDebuggingEnabled() === false) {
     127            set_transient('minicrm_project_ids_cache', $projectIds, 1 * HOUR_IN_SECONDS);
     128        }
    125129
    126130        return $projectIds;

  • minicrm-woocommerce-sync/trunk/minicrm-woocommerce-sync.php

    r3262157 r3294841  
    1010 * Requires PHP: 8.0
    1111 * Text Domain: minicrm-woocommerce-sync
    12  * Version: 1.7.0
     12 * Version: 1.7.1
    1313 * WC requires at least: 4.0.0
    1414 * WC tested up to: 7.2

  • minicrm-woocommerce-sync/trunk/readme.txt

    r3262157 r3294841  
    55Requires at least: 4.9
    66Requires PHP: 8.0
    7 Stable tag: 1.7.0
     7Stable tag: 1.7.1
    88Tested up to: 6.2
    99WC requires at least: 4.0.0
Note: See TracChangeset for help on using the changeset viewer.