Changeset 3767376

Timestamp:

10/26/2026 09:35:32 PM (3 hours ago)

Author:

aldavigdis

Message:

Updating trunk fo v0.8.4

Location:

tengill-for-dk/trunk

Files:

• composer.json (modified) (2 diffs)
• composer.lock (modified) (3 diffs)
• js/admin.js (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• src/Admin.php (modified) (1 diff)
• src/Config.php (modified) (1 diff)
• src/Discounts.php (modified) (3 diffs)
• src/Export/CreditInvoice.php (modified) (1 diff)
• tengill-for-dk.php (modified) (1 diff)
• vendor/autoload.php (modified) (1 diff)
• vendor/composer/autoload_real.php (modified) (2 diffs)
• vendor/composer/autoload_static.php (modified) (2 diffs)
• vendor/composer/installed.php (modified) (2 diffs)

tengill-for-dk/trunk/composer.json

@@ -1 +1 @@
 {
     "name": "aldavigdis/tengill-for-dk",
-    "version": "0.8.3",
+    "version": "0.8.4",
     "type": "wordpress-plugin",
     "require-dev": {
@@ -96 +96 @@
         "lint:fix": "./vendor/bin/phpcbf -s ./src/ ./js/ ./style/ ./views/",
         "release:svn": "bash ./bin/release-svn.sh",
-        "release:trunk": "bash ./bin/release-svn.sh",
+        "release:trunk": "bash ./bin/release-trunk.sh",
         "release:zip": "bash ./bin/release-zip.sh",
         "checksums:generate": "bash ./bin/checksums-generate.sh",

tengill-for-dk/trunk/composer.lock

@@ -5 +5 @@
         "This file is @generated automatically"
     ],
-    "content-hash": "cf1bfc9a336473886ffe76ea392a5759",
+    "content-hash": "d21857c2a13a3bfae1f37af7f66337f0",
     "packages": [
         {
@@ -1059 +1059 @@
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "2.3.6",
+            "version": "2.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "1427af4647235b4a73b13940b1f1258d3584f36e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1427af4647235b4a73b13940b1f1258d3584f36e",
-                "reference": "1427af4647235b4a73b13940b1f1258d3584f36e",
+                "reference": "ec4293f7caf9936acce286b589ccb84faf1aa88d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/ec4293f7caf9936acce286b589ccb84faf1aa88d",
+                "reference": "ec4293f7caf9936acce286b589ccb84faf1aa88d",
                 "shasum": ""
             },
@@ -1100 +1100 @@
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.6"
-            },
-            "time": "2026-09-27T20:07:45+00:00"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.8"
+            },
+            "time": "2026-10-26T20:24:50+00:00"
         },
         {

tengill-for-dk/trunk/js/admin.js

@@ -213 +213 @@
                         );
 
+                        const blockedCustomerText = document.getElementById(
+                                'blocked_customer_message_field'
+                        ).value.trim();;
+
+                        formDataObject['blocked_customers_message'] = blockedCustomerText;
+
                         TengillForDk.postSettingsData( formDataObject );
 

tengill-for-dk/trunk/readme.txt

@@ -1 +1 @@
 === Tengill for dk ===
-Stable tag: 0.8.3
+Stable tag: 0.8.4
 Contributors: @aldavigdis
 Tags: WooCommerce, dk, dkPlus, Inventory, Invoicing
@@ -103 +103 @@
 
 == Changelog ==
+= 0.8.4 =
+* Adding support for the new WordPress 7.2 Secrets class for storing the API key
+* Improving credit invoice handling
+* Fixed a bug that prevented the "blocked customer" message
+
 = 0.8.3 =
 * Adding support for the new WP Secrets API
@@ -280 +285 @@
 Alternatively, you can generate and download a PDF invoice directly from the WooCommerce order interface.
 
+= What is dk? =
+
+dk is a suite of accounting and *enterprise resource planning* (ERP) software specific to the Icelandic market provided by *dk hugbúnaður ehf*. This plugin connects to the dkPlus API as a means of sending and receiving data from dk.
+
+Please note that despite what your AI agent keeps telling you, dk has nothing to do with the country of Denmark.
+
 = Is this the same software as the similar 1984 plugin? =
 
 Tengill traces its roots to the same project and is made by the same main author but is strictly speaking not the same software. The name of the company, branding and other intellectual property that does not fall under the GPLv3 license have been removed and are not used for marketing or sales purposes as per 1984's request.
 
-The progress that has happened since then has resulted in a completely separate WordPress plugin that is still actively maintained and supported.
-
-The two are incompatible and cannot work as drop-in replacements for each other.
+The progress that has happened since then has resulted in a completely separate WordPress plugin that is still actively maintained and supported, as opposed to the other which should be considered unfit for its intended us in its current state.
 
 Just to name a few of the bugs and quirks that have been fixed, the scalability has been wastly improved which means that thousands of products can be synced, improved calculations for line item prices, totals and VAT, improved support for international customers, an improved user interface and new features such as product discount support, product category sync and customer contacts.

tengill-for-dk/trunk/src/Admin.php

@@ -24 +24 @@
  */
 class Admin {
-        const ASSET_VERSION = '0.8.3';
+        const ASSET_VERSION = '0.8.4';
         const PLUGIN_SLUG   = 'tengill-for-dk';
 

tengill-for-dk/trunk/src/Config.php

@@ -130 +130 @@
                                 return $secret->reveal();
                         }
+
+                        // If the current API key is in the options table, we want to cast
+                        // it into a secret on-the-fly instead of keeping it as an
+                        // unencrypted WP option and delete the old API key option.
+                        self::migrate_api_key_to_secret();
                 }
 
                 return self::get_option( 'api_key' );
+        }
+
+        /**
+         * Migrate the API key stoe to the Secret store
+         */
+        private static function migrate_api_key_to_secret(): bool {
+                if ( ! function_exists( 'wp_set_secret' ) ) {
+                        return false;
+                }
+
+                $old_key = self::get_option( 'api_key' );
+
+                if ( is_string( $old_key ) && self::set_dk_api_key( $old_key ) ) {
+                        return delete_option( self::PREFIX . 'api_key' );
+                }
+
+                return true;
         }
 

tengill-for-dk/trunk/src/Discounts.php

@@ -15 +15 @@
 use WP_User;
 use WC_Cart;
-use WC_Order;
 use WC_Order_Item_Coupon;
+use WC_Abstract_Order;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -933 +933 @@
          * confirmations, which are extremely common.
          *
-         * @param WC_Order $order The order to recalculate discount totals for.
+         * @param WC_Abstract_Order $order The order to recalculate discount totals for.
          *
          * @return object{success:bool,total:string,tax:string,grand_total:string}
          */
         public static function calculate_discount_totals(
-                WC_Order $order
+                WC_Abstract_Order $order
         ): object {
                 $discount_total     = BigDecimal::of( 0 );
@@ -1070 +1070 @@
          * `woocommerce_order_after_calculate_totals`.
          *
-         * @param bool     $and_taxes Unused.
-         * @param WC_Order $order The WooCommerce order.
+         * @param bool              $and_taxes Unused.
+         * @param WC_Abstract_Order $order The WooCommerce order.
          */
         public static function calculate_discount_totals_action(
                 bool $and_taxes,
-                WC_Order $order
+                WC_Abstract_Order $order
         ): object {
                 return self::calculate_discount_totals( $order );

tengill-for-dk/trunk/src/Export/CreditInvoice.php

@@ -116 +116 @@
                 $invoice_body['Mode']     = $payment_mapping->dk_mode;
                 $invoice_body['Term']     = $payment_mapping->dk_term;
-                $invoice_body['SaleType'] = 2;
+                $invoice_body['SaleType'] = 1;
 
                 foreach ( $order_refund->get_items() as $item ) {

tengill-for-dk/trunk/tengill-for-dk.php

@@ -5 +5 @@
  * Plugin URI: https://tengillpro.is/
  * Description: Sync your WooCommerce store with DK, including prices, inventory status and generate invoices for customers on checkout.
- * Version: 0.8.3
+ * Version: 0.8.4
  * Requires at least: 6.9
  * Requires PHP: 8.2

tengill-for-dk/trunk/vendor/autoload.php

@@ -20 +20 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitcf1bfc9a336473886ffe76ea392a5759::getLoader();
+return ComposerAutoloaderInitd21857c2a13a3bfae1f37af7f66337f0::getLoader();

tengill-for-dk/trunk/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitcf1bfc9a336473886ffe76ea392a5759
+class ComposerAutoloaderInitd21857c2a13a3bfae1f37af7f66337f0
 {
     private static $loader;
@@ -25 +25 @@
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInitcf1bfc9a336473886ffe76ea392a5759', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitd21857c2a13a3bfae1f37af7f66337f0', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitcf1bfc9a336473886ffe76ea392a5759', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitd21857c2a13a3bfae1f37af7f66337f0', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitcf1bfc9a336473886ffe76ea392a5759::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitd21857c2a13a3bfae1f37af7f66337f0::getInitializer($loader));
 
         $loader->register(true);

tengill-for-dk/trunk/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInitcf1bfc9a336473886ffe76ea392a5759
+class ComposerStaticInitd21857c2a13a3bfae1f37af7f66337f0
 {
     public static $prefixLengthsPsr4 = array (
@@ -372 +372 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitcf1bfc9a336473886ffe76ea392a5759::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitcf1bfc9a336473886ffe76ea392a5759::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitcf1bfc9a336473886ffe76ea392a5759::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitd21857c2a13a3bfae1f37af7f66337f0::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitd21857c2a13a3bfae1f37af7f66337f0::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitd21857c2a13a3bfae1f37af7f66337f0::$classMap;
 
         }, null, ClassLoader::class);

tengill-for-dk/trunk/vendor/composer/installed.php

@@ -2 +2 @@
     'root' => array(
         'name' => 'aldavigdis/tengill-for-dk',
-        'pretty_version' => '0.8.3',
-        'version' => '0.8.3.0',
+        'pretty_version' => '0.8.4',
+        'version' => '0.8.4.0',
         'reference' => null,
         'type' => 'wordpress-plugin',
@@ -12 +12 @@
     'versions' => array(
         'aldavigdis/tengill-for-dk' => array(
-            'pretty_version' => '0.8.3',
-            'version' => '0.8.3.0',
+            'pretty_version' => '0.8.4',
+            'version' => '0.8.4.0',
             'reference' => null,
             'type' => 'wordpress-plugin',