+ 
+
Mollie API client for PHP
+ +
+
+Accepting [iDEAL](https://www.mollie.com/payments/ideal/), [Apple Pay](https://www.mollie.com/payments/apple-pay), [Bancontact](https://www.mollie.com/payments/bancontact/), [SOFORT Banking](https://www.mollie.com/payments/sofort/), [Creditcard](https://www.mollie.com/payments/credit-card/), [SEPA Bank transfer](https://www.mollie.com/payments/bank-transfer/), [SEPA Direct debit](https://www.mollie.com/payments/direct-debit/), [PayPal](https://www.mollie.com/payments/paypal/), [Belfius Direct Net](https://www.mollie.com/payments/belfius/), [KBC/CBC](https://www.mollie.com/payments/kbc-cbc/), [paysafecard](https://www.mollie.com/payments/paysafecard/), [ING Home'Pay](https://www.mollie.com/payments/ing-homepay/), [Giropay](https://www.mollie.com/payments/giropay/), [EPS](https://www.mollie.com/payments/eps/), [Przelewy24](https://www.mollie.com/payments/przelewy24/), [Postepay](https://www.mollie.com/en/payments/postepay), [In3](https://www.mollie.com/payments/in3/), [Klarna](https://www.mollie.com/payments/klarna-pay-later/) ([Pay now](https://www.mollie.com/payments/klarna-pay-now/), [Pay later](https://www.mollie.com/payments/klarna-pay-later/), [Slice it](https://www.mollie.com/payments/klarna-slice-it/), [Pay in 3](https://www.mollie.com/payments/klarna-pay-in-3/)), [Giftcard](https://www.mollie.com/payments/gift-cards/) and [Voucher](https://www.mollie.com/en/payments/meal-eco-gift-vouchers) online payments without fixed monthly costs or any punishing registration procedures. Just use the Mollie API to receive payments directly on your website or easily refund transactions to your customers.
+
+[](https://github.com/mollie/mollie-api-php/actions)
+[](https://packagist.org/packages/mollie/mollie-api-php)
+[](https://packagist.org/packages/mollie/mollie-api-php)
+
+## Requirements ##
+To use the Mollie API client, the following things are required:
+
++ Get yourself a free [Mollie account](https://www.mollie.com/signup). No sign up costs.
++ Now you're ready to use the Mollie API client in test mode.
++ Follow [a few steps](https://www.mollie.com/dashboard/?modal=onboarding) to enable payment methods in live mode, and let us handle the rest.
++ PHP >= 7.0
++ Up-to-date OpenSSL (or other SSL/TLS toolkit)
+
+For leveraging [Mollie Connect](https://docs.mollie.com/oauth/overview) (advanced use cases only), we recommend also installing our [OAuth2 client](https://github.com/mollie/oauth2-mollie-php).
+
+## Composer Installation ##
+
+By far the easiest way to install the Mollie API client is to require it with [Composer](http://getcomposer.org/doc/00-intro.md).
+
+ $ composer require mollie/mollie-api-php:^2.0
+
+ {
+ "require": {
+ "mollie/mollie-api-php": "^2.0"
+ }
+ }
+
+The version of the API client corresponds to the version of the API it implements. Check the [notes on migration](https://docs.mollie.com/migrating-v1-to-v2) to see what changes you need to make if you want to start using a newer API version.
+
+
+## Manual Installation ##
+If you're not familiar with using composer we've added a ZIP file to the releases containing the API client and all the packages normally installed by composer.
+Download the ``mollie-api-php.zip`` from the [releases page](https://github.com/mollie/mollie-api-php/releases).
+
+Include the ``vendor/autoload.php`` as shown in [Initialize example](https://github.com/mollie/mollie-api-php/blob/master/examples/initialize.php).
+
+## How to receive payments ##
+
+To successfully receive a payment, these steps should be implemented:
+
+1. Use the Mollie API client to create a payment with the requested amount, currency, description and optionally, a payment method. It is important to specify a unique redirect URL where the customer is supposed to return to after the payment is completed.
+
+2. Immediately after the payment is completed, our platform will send an asynchronous request to the configured webhook to allow the payment details to be retrieved, so you know when exactly to start processing the customer's order.
+
+3. The customer returns, and should be satisfied to see that the order was paid and is now being processed.
+
+Find our full documentation online on [docs.mollie.com](https://docs.mollie.com).
+
+## Getting started ##
+
+Initializing the Mollie API client, and setting your API key.
+
+```php
+$mollie = new \Mollie\Api\MollieApiClient();
+$mollie->setApiKey("test_dHar4XY7LxsDOtmnkVtjNVWXLSlXsM");
+```
+
+Creating a new payment.
+
+```php
+$payment = $mollie->payments->create([
+ "amount" => [
+ "currency" => "EUR",
+ "value" => "10.00"
+ ],
+ "description" => "My first API payment",
+ "redirectUrl" => "https://webshop.example.org/order/12345/",
+ "webhookUrl" => "https://webshop.example.org/mollie-webhook/",
+]);
+```
+_After creation, the payment id is available in the `$payment->id` property. You should store this id with your order._
+
+After storing the payment id you can send the customer to the checkout using the `$payment->getCheckoutUrl()`.
+
+```php
+header("Location: " . $payment->getCheckoutUrl(), true, 303);
+```
+_This header location should always be a GET, thus we enforce 303 http response code_
+
+For a payment create example, see [Example - New Payment](https://github.com/mollie/mollie-api-php/blob/master/examples/payments/create-payment.php).
+
+## Retrieving payments ##
+We can use the `$payment->id` to retrieve a payment and check if the payment `isPaid`.
+
+```php
+$payment = $mollie->payments->get($payment->id);
+
+if ($payment->isPaid())
+{
+ echo "Payment received.";
+}
+```
+
+Or retrieve a collection of payments.
+
+```php
+$payments = $mollie->payments->page();
+```
+
+For an extensive example of listing payments with the details and status, see [Example - List Payments](https://github.com/mollie/mollie-api-php/blob/master/examples/payments/list-payments.php).
+
+## Payment webhook ##
+
+When the status of a payment changes the `webhookUrl` we specified in the creation of the payment will be called.
+There we can use the `id` from our POST parameters to check te status and act upon that, see [Example - Webhook](https://github.com/mollie/mollie-api-php/blob/master/examples/payments/webhook.php).
+
+
+## Multicurrency ##
+Since 2.0 it is now possible to create non-EUR payments for your customers.
+A full list of available currencies can be found [in our documentation](https://docs.mollie.com/guides/multicurrency).
+
+```php
+$payment = $mollie->payments->create([
+ "amount" => [
+ "currency" => "USD",
+ "value" => "10.00"
+ ],
+ "description" => "Order #12345",
+ "redirectUrl" => "https://webshop.example.org/order/12345/",
+ "webhookUrl" => "https://webshop.example.org/mollie-webhook/",
+]);
+```
+_After creation, the `settlementAmount` will contain the EUR amount that will be settled on your account._
+
+
+### Fully integrated iDEAL payments ###
+
+If you want to fully integrate iDEAL payments in your web site, some additional steps are required. First, you need to
+retrieve the list of issuers (banks) that support iDEAL and have your customer pick the issuer he/she wants to use for
+the payment.
+
+Retrieve the iDEAL method and include the issuers
+
+```php
+$method = $mollie->methods->get(\Mollie\Api\Types\PaymentMethod::IDEAL, ["include" => "issuers"]);
+```
+
+_`$method->issuers` will be a list of objects. Use the property `$id` of this object in the
+ API call, and the property `$name` for displaying the issuer to your customer. For a more in-depth example, see [Example - iDEAL payment](https://github.com/mollie/mollie-api-php/blob/master/examples/payments/create-ideal-payment.php)._
+
+Create a payment with the selected issuer:
+
+```php
+$payment = $mollie->payments->create([
+ "amount" => [
+ "currency" => "EUR",
+ "value" => "10.00"
+ ],
+ "description" => "My first API payment",
+ "redirectUrl" => "https://webshop.example.org/order/12345/",
+ "webhookUrl" => "https://webshop.example.org/mollie-webhook/",
+ "method" => \Mollie\Api\Types\PaymentMethod::IDEAL,
+ "issuer" => $selectedIssuerId, // e.g. "ideal_INGBNL2A"
+]);
+```
+
+_The `_links` property of the `$payment` object will contain an object `checkout` with a `href` property, which is a URL that points directly to the online banking environment of the selected issuer.
+A short way of retrieving this URL can be achieved by using the `$payment->getCheckoutUrl()`._
+
+### Refunding payments ###
+
+The API also supports refunding payments. Note that there is no confirmation and that all refunds are immediate and
+definitive. refunds are supported for all methods except for paysafecard and gift cards.
+
+```php
+$payment = $mollie->payments->get($payment->id);
+
+// Refund € 2 of this payment
+$refund = $payment->refund([
+ "amount" => [
+ "currency" => "EUR",
+ "value" => "2.00"
+ ]
+]);
+```
+
+For a working example, see [Example - Refund payment](https://github.com/mollie/mollie-api-php/blob/master/examples/payments/refund-payment.php).
+
+## Enabling debug mode
+
+When debugging it can be convenient to have the submitted request available on the `ApiException`.
+
+In order to prevent leaking sensitive request data into your local application logs, debugging is disabled by default.
+
+To enable debugging and inspect the request:
+
+```php
+/** @var $mollie \Mollie\Api\MollieApiClient */
+$mollie->enableDebugging();
+
+try {
+ $mollie->payments->get('tr_12345678');
+} catch (\Mollie\Api\Exceptions\ApiException $exception) {
+ $request = $exception->getRequest();
+}
+```
+
+If you're logging the `ApiException`, the request will also be logged. Make sure to not retain any sensitive data in
+these logs and clean up after debugging.
+
+To disable debugging again:
+
+```php
+/** @var $mollie \Mollie\Api\MollieApiClient */
+$mollie->disableDebugging();
+```
+
+Note that debugging is only available when using the default Guzzle http adapter (`Guzzle6And7MollieHttpAdapter`).
+
+## API documentation ##
+If you wish to learn more about our API, please visit the [Mollie Developer Portal](https://www.mollie.com/developers). API Documentation is available in English.
+
+## Want to help us make our API client even better? ##
+
+Want to help us make our API client even better? We take [pull requests](https://github.com/mollie/mollie-api-php/pulls?utf8=%E2%9C%93&q=is%3Apr), sure. But how would you like to contribute to a technology oriented organization? Mollie is hiring developers and system engineers. [Check out our vacancies](https://jobs.mollie.com/) or [get in touch](mailto:personeel@mollie.com).
+
+## License ##
+[BSD (Berkeley Software Distribution) License](https://opensource.org/licenses/bsd-license.php).
+Copyright (c) 2013-2018, Mollie B.V.
+
+## Support ##
+Contact: [www.mollie.com](https://www.mollie.com) — info@mollie.com — +31 20 820 20 70
diff --git a/assets/mollie/composer.json b/assets/mollie/composer.json
new file mode 100644
index 0000000..8b4dd00
--- /dev/null
+++ b/assets/mollie/composer.json
@@ -0,0 +1,84 @@
+{
+ "name": "mollie\/mollie-api-php",
+ "description": "Mollie API client library for PHP. Mollie is a European Payment Service provider and offers international payment methods such as Mastercard, VISA, American Express and PayPal, and local payment methods such as iDEAL, Bancontact, SOFORT Banking, SEPA direct debit, Belfius Direct Net, KBC Payment Button and various gift cards such as Podiumcadeaukaart and fashioncheque.",
+ "keywords": [
+ "mollie",
+ "payment",
+ "service",
+ "ideal",
+ "creditcard",
+ "apple pay",
+ "mistercash",
+ "bancontact",
+ "sofort",
+ "sofortbanking",
+ "sepa",
+ "paypal",
+ "paysafecard",
+ "podiumcadeaukaart",
+ "przelewy24",
+ "banktransfer",
+ "direct debit",
+ "belfius",
+ "belfius direct net",
+ "refunds",
+ "api",
+ "payments",
+ "gateway",
+ "subscriptions",
+ "recurring",
+ "charges",
+ "kbc",
+ "cbc",
+ "gift cards",
+ "intersolve",
+ "fashioncheque",
+ "inghomepay",
+ "klarna",
+ "paylater",
+ "sliceit"
+ ],
+ "homepage": "https:\/\/www.mollie.com\/en\/developers",
+ "license": "BSD-2-Clause",
+ "authors": [
+ {
+ "name": "Mollie B.V.",
+ "email": "info@mollie.com"
+ }
+ ],
+ "require": {
+ "php": "^7.2|^8.0",
+ "ext-curl": "*",
+ "ext-json": "*",
+ "ext-openssl": "*",
+ "composer\/ca-bundle": "^1.2"
+ },
+ "require-dev": {
+ "eloquent\/liberator": "^2.0||^3.0",
+ "friendsofphp\/php-cs-fixer": "^3.0",
+ "guzzlehttp\/guzzle": "^6.3",
+ "phpstan\/phpstan": "^1.4",
+ "phpunit\/phpunit": "^8.5 || ^9.5"
+ },
+ "suggest": {
+ "mollie\/oauth2-mollie-php": "Use OAuth to authenticate with the Mollie API. This is needed for some endpoints. Visit https:\/\/docs.mollie.com\/ for more information."
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "autoload": {
+ "psr-4": {
+ "Mollie\\Api\\": "src\/"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "_PhpScoperf7c63b60b99d\\Tests\\": "tests\/",
+ "_PhpScoperf7c63b60b99d\\Tests\\Mollie\\Api\\": "tests\/Mollie\/API\/"
+ }
+ },
+ "scripts": {
+ "test": ".\/vendor\/bin\/phpunit tests",
+ "format": ".\/vendor\/bin\/php-cs-fixer fix --allow-risky=yes"
+ }
+}
\ No newline at end of file
diff --git a/assets/mollie/src/.DS_Store b/assets/mollie/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c6ec5837655044ebf2159e546cc74c086deb766e
GIT binary patch
literal 6148
zcmeHKyH3L}6umB?>SO5!Z21JbFfpW6EAiMUA5i)bAT>$V2Wq!`0umb^!iJdm4t|Am
zuPumGTVg^8`AYV2?Q@-zlf
+
';
+} else {
+ $view = '';
+}
+
+$view .= '
+
+ Payment Successful!
+
+ Your payment has been processed. Please reconnect your device to apply the software upgrade.
+Payment ID: '.htmlspecialchars($payment_return).'
+
diff --git a/webhook_mollie.php b/webhook_mollie.php
new file mode 100644
index 0000000..07280da
--- /dev/null
+++ b/webhook_mollie.php
@@ -0,0 +1,210 @@
+ software_update_user, "clientsecret" => software_update_pw), JSON_UNESCAPED_UNICODE);
+$responses = ioAPIv2('/v2/authorization', $data,'');
+if (!empty($responses)){$responses = json_decode($responses,true);}else{$responses = '400';}
+$clientsecret = $responses['token'];
+
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++
+// BASEURL is required for invoice template
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++
+$base_url = 'https://'.$_SERVER['SERVER_NAME'].'/';
+define('base_url', $base_url);
+
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++
+// Initialize DomPDF for invoice generation
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++
+use Dompdf\Dompdf;
+use Dompdf\Options;
+$options = new Options();
+$options->set('isRemoteEnabled', true);
+$dompdf = new Dompdf($options);
+
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++
+// Language mapping for invoices
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++
+$available_languages = [
+ 'NL' => 'NL',
+ 'BE' => 'NL',
+ 'US' => 'US',
+ 'GB' => 'US',
+ 'DE' => 'DE',
+ 'FR' => 'FR',
+ 'ES' => 'ES'
+];
+
+try {
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ // Initialize the Mollie API library
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ require "initialize.php"; // Mollie initialization
+
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ // DEBUG MODE - Handle fake payment IDs
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ if (debug && isset($_POST["id"]) && strpos($_POST["id"], 'DEBUG_') === 0) {
+ // In DEBUG mode, simulate webhook callback
+ $payment_id = $_POST["id"];
+ $orderId = $payment_id;
+
+ // Simulate payment status as paid
+ $payment_status = 1; // Paid
+
+ } else {
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ // PRODUCTION MODE - Retrieve the payment's current state from Mollie
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ $payment = $mollie->payments->get($_POST["id"]);
+ $orderId = $payment->metadata->order_id;
+ $payment_status = null;
+
+ if ($payment->isPaid() && !$payment->hasRefunds() && !$payment->hasChargebacks()) {
+ $payment_status = 1; // Paid
+ } elseif ($payment->isOpen() || $payment->isPending()) {
+ $payment_status = 101; // Open/Pending
+ } elseif ($payment->isFailed()) {
+ $payment_status = 102; // Failed
+ } elseif ($payment->isExpired()) {
+ $payment_status = 103; // Expired
+ } elseif ($payment->isCanceled()) {
+ $payment_status = 999; // Canceled
+ }
+ }
+
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ // Update transaction status via API
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ if ($payment_status !== null) {
+ $payload = json_encode(array("txn_id" => $orderId, "payment_status" => $payment_status), JSON_UNESCAPED_UNICODE);
+ $transaction = ioAPIv2('/v2/transactions/',$payload,$clientsecret);
+ $transaction = json_decode($transaction,true);
+
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ // Only create license and invoice if payment is PAID
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ if ($payment_status == 1 && $transaction !== null && !empty($transaction)) {
+ if(count($transaction) > 0) {
+
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ // CREATE LICENSE for software upgrade
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ $pdo = dbConnect($dbname);
+
+ // Fetch transaction items to find software upgrade
+ $sql = 'SELECT * FROM transactions_items WHERE txn_id = ?';
+ $stmt = $pdo->prepare($sql);
+ $stmt->execute([$orderId]);
+ $items = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+ foreach ($items as $item) {
+ if (!empty($item['item_options'])) {
+ $options = json_decode($item['item_options'], true);
+
+ // Check if this is a software upgrade (has serial_number and equipment_id)
+ if (isset($options['serial_number']) && isset($options['equipment_id'])) {
+
+ // Check if license already exists for this transaction
+ $sql = 'SELECT rowID FROM products_software_licenses WHERE transaction_id = ?';
+ $stmt = $pdo->prepare($sql);
+ $stmt->execute([$orderId]);
+ $existing_license = $stmt->fetch(PDO::FETCH_ASSOC);
+
+ if (!$existing_license) {
+ // Generate unique license key
+ $license_key = generateUniqueLicenseKey();
+
+ // Create license
+ $sql = 'INSERT INTO products_software_licenses
+ (license_key, equipment_id, license_type, status, start_at, expires_at, transaction_id, created, createdby)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)';
+ $stmt = $pdo->prepare($sql);
+ $stmt->execute([
+ $license_key,
+ $options['equipment_id'],
+ 'upgrade',
+ 1, // active
+ date('Y-m-d H:i:s'),
+ '2099-12-31 23:59:59', // effectively permanent
+ $orderId,
+ date('Y-m-d H:i:s'),
+ 'webhook' // created by webhook
+ ]);
+
+ // Update equipment.sw_version_license
+ $sql = 'UPDATE equipment SET sw_version_license = ? WHERE rowID = ?';
+ $stmt = $pdo->prepare($sql);
+ $stmt->execute([$license_key, $options['equipment_id']]);
+ }
+ }
+ }
+ }
+
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ // Generate INVOICE via API
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ $payload = json_encode(array("txn_id" => $transaction['transaction_id']), JSON_UNESCAPED_UNICODE);
+ $invoice = ioAPIv2('/v2/invoice/',$payload,$clientsecret);
+ $invoice = json_decode($invoice,true);
+
+ if ($invoice !== null && !empty($invoice)) {
+ // Fetch full invoice data with customer details
+ $invoice_cust = ioAPIv2('/v2/invoice/list=invoice&id='.$invoice['invoice_id'],'',$clientsecret);
+ $invoice_cust = json_decode($invoice_cust,true);
+
+ // Determine invoice language
+ if (!empty($invoice_cust['customer']['language'])) {
+ $invoice_language = strtoupper($invoice_cust['customer']['language']);
+ } elseif (!empty($invoice_cust['customer']['country']) && isset($available_languages[strtoupper($invoice_cust['customer']['country'])])) {
+ $invoice_language = $available_languages[strtoupper($invoice_cust['customer']['country'])];
+ } else {
+ $invoice_language = 'US'; // Default fallback
+ }
+
+ // Generate invoice HTML (using custom template for software upgrades)
+ list($data,$customer_email,$order_id) = generateSoftwareInvoice($invoice_cust,$orderId,$invoice_language);
+
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ //CREATE PDF using DomPDF
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ $dompdf->loadHtml($data);
+ $dompdf->setPaper('A4', 'portrait');
+ $dompdf->render();
+ $subject = 'Software Upgrade - Invoice: '.$order_id;
+ $attachment = $dompdf->output();
+
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ //Send email via PHPMailer
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ send_mail($customer_email, $subject, $data, $attachment, $subject);
+
+ // Send to bookkeeping if configured
+ if(invoice_bookkeeping){
+ send_mail(email_bookkeeping, $subject, $data, $attachment, $subject);
+ }
+ }
+ }
+ }
+ }
+
+ // Return 200 OK to Mollie
+ http_response_code(200);
+ echo "OK";
+
+} catch (\Mollie\Api\Exceptions\ApiException $e) {
+ error_log("Webhook API call failed: " . htmlspecialchars($e->getMessage()));
+ http_response_code(500);
+} catch (Exception $e) {
+ error_log("Webhook error: " . htmlspecialchars($e->getMessage()));
+ http_response_code(500);
+}
+
+?>
From 543f0b3cac919fab07159862e1876d61d62a723f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”>
Date: Wed, 24 Dec 2025 14:07:28 +0100
Subject: [PATCH 2/2] feat: Add software licenses management page and update
payment handling
- Introduced a new licenses management page with functionality to create, update, and view software licenses.
- Updated payment return handling in softwaretool.php to check payment status from the database and display appropriate modals for success, pending, and failure states.
- Enhanced webhook_mollie.php to log webhook calls, handle payment status updates directly in the database, and generate invoices based on payment status.
- Improved CSS styles for better alignment of buttons and modal components.
- Added JavaScript for modal interactions and bulk license creation functionality.
---
.gitignore | 3 +
api/v2/get/equipments.php | 4 +
api/v2/get/products_software_licenses.php | 22 +-
api/v2/get/software_available.php | 8 +-
api/v2/get/software_update.php | 8 +-
api/v2/post/dealers.php | 36 ++
api/v2/post/payment.php | 166 +++---
api/v2/post/products_software_licenses.php | 120 +++-
api/v2/post/products_software_versions.php | 19 +-
assets/functions.php | 68 ++-
assets/softwaretool.js | 173 ++++--
custom/bewellwell/style/bewellwell.css | 47 ++
custom/soveliti/style/soveliti.css | 47 ++
equipment.php | 3 +-
licenses.php | 606 +++++++++++++++++++++
settings/settingsmenu.php | 6 +
settings/settingsprofiles.php | 4 +-
settings/settingsviews.php | 5 +
softwaretool.php | 99 +++-
style/admin.css | 44 ++
webhook_mollie.php | 150 ++++-
21 files changed, 1400 insertions(+), 238 deletions(-)
create mode 100644 licenses.php
diff --git a/.gitignore b/.gitignore
index 689a894..3d559fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,6 @@ settings/config.php
variable_scan.php
settings/soveliti/soveliti_config.php
settings/soveliti/soveliti_settings.php
+assets/database/dev_schema.sql
+assets/database/migration.sql
+assets/database/prod_schema.sql
diff --git a/api/v2/get/equipments.php b/api/v2/get/equipments.php
index ff797aa..d02c76d 100644
--- a/api/v2/get/equipments.php
+++ b/api/v2/get/equipments.php
@@ -49,6 +49,9 @@ if(isset($get_content) && $get_content!=''){
elseif ($v[0] == 'equipmentid') {
//build up search
$clause .= ' AND e.rowID = :'.$v[0];
+
+ //UPDATE VERSION STATUS
+ $sw_version_latest_update = 1;
}
elseif ($v[0] == 'servicedate') {
//build up service coverage
@@ -69,6 +72,7 @@ if(isset($get_content) && $get_content!=''){
elseif ($v[0] == 'h_equipmentid') {
//build up search
$clause .= ' AND h.equipmentid = :'.$v[0];
+
}
elseif ($v[0] == 'status') {
//Update status based on status
diff --git a/api/v2/get/products_software_licenses.php b/api/v2/get/products_software_licenses.php
index 85e6e67..f47175d 100644
--- a/api/v2/get/products_software_licenses.php
+++ b/api/v2/get/products_software_licenses.php
@@ -1,6 +1,8 @@
soldto) || $partner->soldto == ''){$soldto_search = '%';} else {$soldto_search = '-%';}
//default whereclause
-list($whereclause,$condition) = getWhereclauselvl2("software_licenses",$permission,$partner,'get');
+list($whereclause,$condition) = getWhereclauselvl2("products_software_licenses",$permission,$partner,'get');
//NEW ARRAY
$criterias = [];
@@ -52,12 +54,20 @@ if(isset($criterias['totals']) && $criterias['totals'] ==''){
$sql = 'SELECT count(*) as count FROM products_software_licenses '.$whereclause.'';
}
elseif (isset($criterias['list']) && $criterias['list'] =='') {
- //SQL for list
- $sql = 'SELECT l.*, u.username, v.name as version_name FROM products_software_licenses l LEFT JOIN users u ON l.user_id = u.id LEFT JOIN products_software_versions v ON l.version_id = v.rowID '.$whereclause.' ORDER BY l.created DESC';
+ //SQL for list
+ $sql = 'SELECT l.*, v.name as version_name, v.version, e.serialnumber as assigned_serial
+ FROM products_software_licenses l
+ LEFT JOIN products_software_versions v ON l.version_id = v.rowID
+ LEFT JOIN equipment e ON l.license_key = e.sw_version_license
+ '.$whereclause.' ORDER BY l.created DESC';
}
else {
- //SQL for paged
- $sql = 'SELECT l.*, u.username, v.name as version_name FROM products_software_licenses l LEFT JOIN users u ON l.user_id = u.id LEFT JOIN products_software_versions v ON l.version_id = v.rowID '.$whereclause.' ORDER BY l.created DESC LIMIT :page,:num_licenses';
+ //SQL for paged
+ $sql = 'SELECT l.*, v.name as version_name, v.version, e.serialnumber as assigned_serial
+ FROM products_software_licenses l
+ LEFT JOIN products_software_versions v ON l.version_id = v.rowID
+ LEFT JOIN equipment e ON l.license_key = e.sw_version_license
+ '.$whereclause.' ORDER BY l.created DESC LIMIT :page,:num_licenses';
}
$stmt = $pdo->prepare($sql);
diff --git a/api/v2/get/software_available.php b/api/v2/get/software_available.php
index 3cb21b4..3513575 100644
--- a/api/v2/get/software_available.php
+++ b/api/v2/get/software_available.php
@@ -245,16 +245,16 @@ if (isset($criterias['sn']) && $criterias['sn'] != ''){
//Check if there's a valid license for this upgrade
if ($final_price > 0 && $sw_version_license) {
//Check if the license is valid
- $sql = 'SELECT status, start_at, expires_at
+ $sql = 'SELECT status, starts_at, expires_at
FROM products_software_licenses
- WHERE license_key = ? AND equipment_id = ?';
+ WHERE license_key = ?';
$stmt = $pdo->prepare($sql);
- $stmt->execute([$sw_version_license, $equipment_rowid]);
+ $stmt->execute([$sw_version_license]);
$license = $stmt->fetch(PDO::FETCH_ASSOC);
if ($license && $license['status'] == 1) {
$now = date('Y-m-d H:i:s');
- $start_at = $license['start_at'];
+ $start_at = $license['starts_at'];
$expires_at = $license['expires_at'];
//Check if license is within valid date range
diff --git a/api/v2/get/software_update.php b/api/v2/get/software_update.php
index 3a71457..2f4696b 100644
--- a/api/v2/get/software_update.php
+++ b/api/v2/get/software_update.php
@@ -281,16 +281,16 @@ if (isset($criterias['sn']) && $criterias['sn'] != ''){
$license_applied = false;
if ($final_price > 0 && $sw_version_license) {
//Check if the license is valid
- $sql = 'SELECT status, start_at, expires_at
+ $sql = 'SELECT status, starts_at, expires_at
FROM products_software_licenses
- WHERE license_key = ? AND equipment_id = ?';
+ WHERE license_key = ?';
$stmt = $pdo->prepare($sql);
- $stmt->execute([$sw_version_license, $equipment_rowid]);
+ $stmt->execute([$sw_version_license]);
$license = $stmt->fetch(PDO::FETCH_ASSOC);
if ($license && $license['status'] == 1) {
$now = date('Y-m-d H:i:s');
- $start_at = $license['start_at'];
+ $start_at = $license['starts_at'];
$expires_at = $license['expires_at'];
//Check if license is within valid date range
diff --git a/api/v2/post/dealers.php b/api/v2/post/dealers.php
index 51f517e..d748cb0 100644
--- a/api/v2/post/dealers.php
+++ b/api/v2/post/dealers.php
@@ -354,6 +354,42 @@ elseif(isset($post_content['dealer_closeby'])){
echo json_encode(['error' => "Latitude or longitude not provided."]);
}
}
+elseif(isset($post_content['action']) && $post_content['action']=='unsubscribe'){
+ //++++++++++++++++++++++
+ //Process DEALER UNSUBSCRIBE
+ //++++++++++++++++++++++
+
+ // Check if email is provided
+ if (isset($post_content['email']) && !empty($post_content['email'])) {
+ $email = $post_content['email'];
+
+ try {
+ // Update dealer status to 0 (inactive) where email matches
+ $sql = 'UPDATE dealers SET status = 0 WHERE email = ?';
+ $stmt = $pdo->prepare($sql);
+
+ if ($stmt->execute([$email])) {
+ // Check if any rows were affected
+ if ($stmt->rowCount() > 0) {
+ header('Content-Type: application/json');
+ echo json_encode(['status' => 'success', 'message' => 'Dealer unsubscribed successfully']);
+ } else {
+ header('Content-Type: application/json');
+ echo json_encode(['status' => 'error', 'message' => 'No dealer found with this email']);
+ }
+ } else {
+ header('Content-Type: application/json');
+ echo json_encode(['status' => 'error', 'message' => 'Database update failed']);
+ }
+ } catch (PDOException $e) {
+ header('Content-Type: application/json');
+ echo json_encode(['status' => 'error', 'message' => 'Database error occurred']);
+ }
+ } else {
+ header('Content-Type: application/json');
+ echo json_encode(['status' => 'error', 'message' => 'Email not provided']);
+ }
+}
else
{
//++++++++++++++++++++++
diff --git a/api/v2/post/payment.php b/api/v2/post/payment.php
index 1087f40..84b4c54 100644
--- a/api/v2/post/payment.php
+++ b/api/v2/post/payment.php
@@ -1,11 +1,12 @@
execute([$serial_number]);
$equipment = $stmt->fetch(PDO::FETCH_ASSOC);
if (!$equipment) {
+
http_response_code(404);
echo json_encode(['error' => 'Device not found with serial number: ' . $serial_number], JSON_UNESCAPED_UNICODE);
exit;
@@ -46,15 +49,15 @@ $hw_version = $equipment['hw_version'] ?? '';
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
// STEP 2: Get version data from version_id
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
-$sql = 'SELECT v.rowID as version_id, v.version, v.name, v.description, v.hw_version, p.productcode
- FROM products_software_versions v
- JOIN products_software p ON v.product_software_id = p.rowID
- WHERE v.rowID = ? AND v.is_active = 1';
+$sql = 'SELECT rowID as version_id, version, name, description, hw_version
+ FROM products_software_versions
+ WHERE rowID = ? AND status = 1';
$stmt = $pdo->prepare($sql);
$stmt->execute([$version_id]);
$version = $stmt->fetch(PDO::FETCH_ASSOC);
if (!$version) {
+
http_response_code(404);
echo json_encode(['error' => 'Software version not found or inactive'], JSON_UNESCAPED_UNICODE);
exit;
@@ -93,6 +96,7 @@ if (!$has_upgrade_paths) {
$final_currency = $upgrade_path['currency'] ?? 'EUR';
} else {
// No upgrade path FROM current version
+
http_response_code(400);
echo json_encode(['error' => 'No valid upgrade path from current version'], JSON_UNESCAPED_UNICODE);
exit;
@@ -103,20 +107,20 @@ if (!$has_upgrade_paths) {
// STEP 4: Check license validity (lines 280-311 in software_update.php)
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
if ($final_price > 0 && $sw_version_license) {
- $sql = 'SELECT status, start_at, expires_at
+ $sql = 'SELECT status, starts_at, expires_at
FROM products_software_licenses
- WHERE license_key = ? AND equipment_id = ?';
+ WHERE license_key = ?';
$stmt = $pdo->prepare($sql);
- $stmt->execute([$sw_version_license, $equipment_id]);
+ $stmt->execute([$sw_version_license]);
$license = $stmt->fetch(PDO::FETCH_ASSOC);
if ($license && $license['status'] == 1) {
$now = date('Y-m-d H:i:s');
- $start_at = $license['start_at'];
+ $starts_at = $license['starts_at'];
$expires_at = $license['expires_at'];
// Check if license is within valid date range
- if ((!$start_at || $start_at <= $now) && (!$expires_at || $expires_at >= $now)) {
+ if ((!$starts_at || $starts_at <= $now) && (!$expires_at || $expires_at >= $now)) {
$final_price = '0.00';
}
}
@@ -126,68 +130,18 @@ if ($final_price > 0 && $sw_version_license) {
// STEP 5: Verify price > 0 (free upgrades shouldn't reach payment API)
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
if ($final_price <= 0) {
+
http_response_code(400);
echo json_encode(['error' => 'This upgrade is free. No payment required.'], JSON_UNESCAPED_UNICODE);
exit;
}
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
-// STEP 6: DEBUG MODE - Simulate payment without Mollie
+// STEP 6: DEBUG MODE - Log but continue to real Mollie
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
if (debug) {
- // Generate fake payment ID
- $fake_payment_id = 'DEBUG_' . uniqid() . '_' . time();
- $checkout_url = 'https://'.$_SERVER['SERVER_NAME'].'/softwaretool.php?payment_return=1&payment_id=' . $fake_payment_id;
-
- // Store transaction in DB
- $sql = 'INSERT INTO transactions (txn_id, payment_amount, payment_status, payer_email, first_name, last_name,
- address_street, address_city, address_state, address_zip, address_country, account_id, payment_method, created)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
- $stmt = $pdo->prepare($sql);
- $stmt->execute([
- $fake_payment_id,
- $final_price,
- 0, // 0 = pending
- $user_data['email'] ?? '',
- $user_data['first_name'] ?? '',
- $user_data['last_name'] ?? '',
- $user_data['address_street'] ?? '',
- $user_data['address_city'] ?? '',
- $user_data['address_state'] ?? '',
- $user_data['address_zip'] ?? '',
- $user_data['address_country'] ?? '',
- $serial_number,
- 0, // payment method
- date('Y-m-d H:i:s')
- ]);
-
- // Store transaction item with serial_number in item_options
- $item_options = json_encode([
- 'serial_number' => $serial_number,
- 'equipment_id' => $equipment_id,
- 'hw_version' => $hw_version
- ], JSON_UNESCAPED_UNICODE);
-
- $sql = 'INSERT INTO transactions_items (txn_id, item_id, item_price, item_quantity, item_options, created)
- VALUES (?, ?, ?, ?, ?, ?)';
- $stmt = $pdo->prepare($sql);
- $stmt->execute([
- $fake_payment_id,
- $version_id,
- $final_price,
- 1,
- $item_options,
- date('Y-m-d H:i:s')
- ]);
-
- // Return fake checkout URL
- $messages = json_encode([
- 'checkout_url' => $checkout_url,
- 'payment_id' => $fake_payment_id,
- 'debug_mode' => true
- ], JSON_UNESCAPED_UNICODE);
- echo $messages;
- exit;
+ debuglog("DEBUG MODE: Creating real Mollie payment for testing");
+ debuglog("DEBUG: Serial Number: $serial_number, Version ID: $version_id, Price: $final_price");
}
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -195,66 +149,110 @@ if (debug) {
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
try {
// Initialize Mollie
- require dirname(__FILE__, 3).'/initialize.php';
+ require dirname(__FILE__, 4).'/initialize.php';
// Format price for Mollie (must be string with 2 decimals)
$formatted_price = number_format((float)$final_price, 2, '.', '');
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ // STEP 7A: Generate transaction ID BEFORE creating Mollie payment
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ // Generate unique transaction ID (same as placeorder.php)
+ $txn_id = strtoupper(uniqid('SC') . substr(md5(mt_rand()), 0, 5));
+
+ // Build webhook URL and redirect URL with actual transaction ID
+ $protocol = 'https';
+ $hostname = $_SERVER['SERVER_NAME'];
+ $path = '/';
+ $webhook_url = "{$protocol}://{$hostname}{$path}webhook_mollie.php";
+ $redirect_url = "{$protocol}://{$hostname}{$path}?page=softwaretool&payment_return=1&order_id={$txn_id}";
+
+ if (debug) {
+ debuglog("DEBUG: Transaction ID: {$txn_id}");
+ debuglog("DEBUG: redirectUrl being sent to Mollie: " . $redirect_url);
+ }
+
// Create payment with Mollie
$payment = $mollie->payments->create([
'amount' => [
'currency' => $final_currency ?: 'EUR',
- 'value' => $formatted_price
+ 'value' => "{$formatted_price}"
],
- 'description' => 'Software upgrade to ' . $version['name'] . ' (v' . $version['version'] . ')',
- 'redirectUrl' => 'https://'.$_SERVER['SERVER_NAME'].'/softwaretool.php?payment_return=1&payment_id={id}',
- 'webhookUrl' => 'https://'.$_SERVER['SERVER_NAME'].'/webhook_mollie.php',
+ 'description' => "Software upgrade Order #{$txn_id}",
+ 'redirectUrl' => "{$redirect_url}",
+ 'webhookUrl' => "{$webhook_url}",
'metadata' => [
- 'order_id' => $payment->id // Store payment ID in metadata
+ 'order_id' => $txn_id,
+ 'serial_number' => $serial_number,
+ 'version_id' => $version_id,
+ 'equipment_id' => $equipment_id
]
]);
$mollie_payment_id = $payment->id;
$checkout_url = $payment->getCheckoutUrl();
+ if (debug) {
+ debuglog("DEBUG: Mollie payment created successfully");
+ debuglog("DEBUG: Payment ID: $mollie_payment_id");
+ debuglog("DEBUG: Redirect URL sent: $redirect_url");
+ debuglog("DEBUG: Redirect URL from Mollie object: " . $payment->redirectUrl);
+ debuglog("DEBUG: Full payment object: " . json_encode($payment));
+ debuglog("DEBUG: Checkout URL: $checkout_url");
+ }
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
- // STEP 8: Store transaction in DB
+ // STEP 8: Store transaction in DB using txn_id (order ID)
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ // Split name into first/last (simple split on first space)
+ $full_name = $user_data['name'] ?? '';
+ $name_parts = explode(' ', $full_name, 2);
+ $first_name = $name_parts[0] ?? '';
+ $last_name = $name_parts[1] ?? '';
+
+ // BUILD UP PARTNERHIERARCHY FROM USER
+ $partner_product = json_encode(array("salesid"=>$partner->salesid,"soldto"=>$partner->soldto), JSON_UNESCAPED_UNICODE);
+
$sql = 'INSERT INTO transactions (txn_id, payment_amount, payment_status, payer_email, first_name, last_name,
- address_street, address_city, address_state, address_zip, address_country, account_id, payment_method, created)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+ address_street, address_city, address_state, address_zip, address_country, account_id, payment_method, accounthierarchy, created)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
$stmt = $pdo->prepare($sql);
$stmt->execute([
- $mollie_payment_id,
+ $txn_id, // Use generated transaction ID, not Mollie payment ID
$final_price,
0, // 0 = pending
$user_data['email'] ?? '',
- $user_data['first_name'] ?? '',
- $user_data['last_name'] ?? '',
- $user_data['address_street'] ?? '',
- $user_data['address_city'] ?? '',
- $user_data['address_state'] ?? '',
- $user_data['address_zip'] ?? '',
- $user_data['address_country'] ?? '',
+ $first_name,
+ $last_name,
+ $user_data['address'] ?? '',
+ $user_data['city'] ?? '',
+ '', // address_state (not collected)
+ $user_data['postal'] ?? '',
+ $user_data['country'] ?? '',
$serial_number,
0, // payment method
+ $partner_product,
date('Y-m-d H:i:s')
]);
+ // Get the database ID
+ $transaction_id = $pdo->lastInsertId();
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
// STEP 9: Store transaction item with serial_number in item_options
//+++++++++++++++++++++++++++++++++++++++++++++++++++++
$item_options = json_encode([
'serial_number' => $serial_number,
'equipment_id' => $equipment_id,
- 'hw_version' => $hw_version
+ 'hw_version' => $hw_version,
+ 'mollie_payment_id' => $mollie_payment_id // Store Mollie payment ID in options
], JSON_UNESCAPED_UNICODE);
$sql = 'INSERT INTO transactions_items (txn_id, item_id, item_price, item_quantity, item_options, created)
VALUES (?, ?, ?, ?, ?, ?)';
$stmt = $pdo->prepare($sql);
$stmt->execute([
- $mollie_payment_id,
+ $transaction_id, // Use database transaction ID (not txn_id string, not mollie_payment_id)
$version_id,
$final_price,
1,
diff --git a/api/v2/post/products_software_licenses.php b/api/v2/post/products_software_licenses.php
index faf6fd3..1b3a6fe 100644
--- a/api/v2/post/products_software_licenses.php
+++ b/api/v2/post/products_software_licenses.php
@@ -14,12 +14,16 @@ $post_content = json_decode($input,true);
if (empty($partner->soldto) || $partner->soldto == ''){$soldto_search = '%';} else {$soldto_search = '-%';}
//default whereclause
-list($whereclause,$condition) = getWhereclauselvl2("software_licenses",$permission,$partner,'');
+list($whereclause,$condition) = getWhereclauselvl2("products_software_licenses",$permission,$partner,'');
//SET PARAMETERS FOR QUERY
$id = $post_content['rowID'] ?? ''; //check for rowID
$command = ($id == '')? 'insert' : 'update'; //IF rowID = empty then INSERT
if (isset($post_content['delete'])){$command = 'delete';} //change command to delete
+
+// Check for bulk creation
+$is_bulk = isset($post_content['bulk']) && $post_content['bulk'] === true;
+
$date = date('Y-m-d H:i:s');
//CREATE EMPTY STRINGS
@@ -27,12 +31,90 @@ $clause = '';
$clause_insert ='';
$input_insert = '';
+//------------------------------------------
+// BULK LICENSE CREATION
+//------------------------------------------
+if ($command == 'insert' && $is_bulk && isAllowed('products_software_licenses',$profile,$permission,'C') === 1){
+
+ $version_id = $post_content['version_id'] ?? '';
+ $serials = $post_content['serials'] ?? [];
+ $transaction_id = $post_content['transaction_id'] ?? '';
+ $license_type = $post_content['license_type'] ?? 0;
+ $status = $post_content['status'] ?? 0;
+
+ if (empty($version_id) || empty($serials) || !is_array($serials)) {
+ http_response_code(400);
+ echo json_encode(['error' => 'Invalid parameters for bulk creation']);
+ exit;
+ }
+
+ $accounthierarchy = json_encode(array("salesid"=>$partner->salesid,"soldto"=>$partner->soldto), JSON_UNESCAPED_UNICODE);
+
+ // Prepare statement for bulk insert
+ $sql = 'INSERT INTO products_software_licenses (version_id, license_key, license_type, status, transaction_id, accounthierarchy, created, createdby)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?)';
+ $stmt = $pdo->prepare($sql);
+
+ $created_count = 0;
+ foreach ($serials as $serial) {
+ if (empty($serial)) continue;
+
+ // Generate UUID for license key
+ $license_key = sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+ mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+ mt_rand(0, 0xffff),
+ mt_rand(0, 0x0fff) | 0x4000,
+ mt_rand(0, 0x3fff) | 0x8000,
+ mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
+ );
+
+ try {
+ $stmt->execute([
+ $version_id,
+ $license_key,
+ $license_type,
+ $status,
+ $transaction_id,
+ $accounthierarchy,
+ $date,
+ $username
+ ]);
+
+ // Assign license to equipment if serial number exists
+ $eq_sql = 'UPDATE equipment SET sw_version_license = ? WHERE serialnumber = ? AND accounthierarchy LIKE ?';
+ $eq_stmt = $pdo->prepare($eq_sql);
+ $eq_stmt->execute([$license_key, $serial, '%'.$partner->soldto.'%']);
+
+ $created_count++;
+ } catch (Exception $e) {
+ debuglog("Error creating license for serial $serial: " . $e->getMessage());
+ }
+ }
+
+ echo json_encode(['success' => true, 'created' => $created_count]);
+ exit;
+}
+
+//------------------------------------------
+// SINGLE LICENSE CREATION OR UPDATE
+//------------------------------------------
//ADD STANDARD PARAMETERS TO ARRAY BASED ON INSERT OR UPDATE
if ($command == 'update'){
$post_content['updated'] = $date;
$post_content['updatedby'] = $username;
}
elseif ($command == 'insert'){
+ // Generate UUID for license key if not provided
+ if (empty($post_content['license_key'])) {
+ $post_content['license_key'] = sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+ mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+ mt_rand(0, 0xffff),
+ mt_rand(0, 0x0fff) | 0x4000,
+ mt_rand(0, 0x3fff) | 0x8000,
+ mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
+ );
+ }
+
$post_content['created'] = $date;
$post_content['createdby'] = $username;
$post_content['accounthierarchy'] = json_encode(array("salesid"=>$partner->salesid,"soldto"=>$partner->soldto), JSON_UNESCAPED_UNICODE);
@@ -42,10 +124,10 @@ else {
}
//CREATE NEW ARRAY AND MAP TO CLAUSE
-if(isset($post_content) && $post_content!=''){
+if(isset($post_content) && $post_content!=''){
foreach ($post_content as $key => $var){
- if ($key == 'submit' || $key == 'rowID'){
- //do nothing
+ if ($key == 'submit' || $key == 'rowID' || $key == 'serial' || $key == 'bulk' || $key == 'serials'){
+ //do nothing - skip these fields
}
else {
$criterias[$key] = $var;
@@ -64,27 +146,43 @@ $input_insert = substr($input_insert, 1); //Clean clause - remove first comma
//QUERY AND VERIFY ALLOWED
if ($command == 'update' && isAllowed('products_software_licenses',$profile,$permission,'U') === 1){
-
+
$sql = 'UPDATE products_software_licenses SET '.$clause.' WHERE rowID = ? ';
$execute_input[] = $id;
$stmt = $pdo->prepare($sql);
$stmt->execute($execute_input);
-}
+
+ echo json_encode(['success' => true]);
+}
elseif ($command == 'insert' && isAllowed('products_software_licenses',$profile,$permission,'C') === 1){
-
- //INSERT NEW ITEM
+
+ //INSERT NEW ITEM
$sql = 'INSERT INTO products_software_licenses ('.$clause_insert.') VALUES ('.$input_insert.')';
$stmt = $pdo->prepare($sql);
$stmt->execute($execute_input);
+
+ $new_license_id = $pdo->lastInsertId();
+ $license_key = $post_content['license_key'];
+
+ // Assign license to equipment if serial number provided
+ if (!empty($post_content['serial'])) {
+ $serial = $post_content['serial'];
+ $eq_sql = 'UPDATE equipment SET sw_version_license = ? WHERE serialnumber = ? AND accounthierarchy LIKE ?';
+ $eq_stmt = $pdo->prepare($eq_sql);
+ $eq_stmt->execute([$license_key, $serial, '%'.$partner->soldto.'%']);
+ }
+
+ echo json_encode(['success' => true, 'license_id' => $new_license_id, 'license_key' => $license_key]);
}
elseif ($command == 'delete' && isAllowed('products_software_licenses',$profile,$permission,'D') === 1){
-
+
$stmt = $pdo->prepare('DELETE FROM products_software_licenses WHERE rowID = ? ');
- $stmt->execute([ $id ]);
+ $stmt->execute([ $id ]);
//Add deletion to changelog
changelog($dbname,'products_software_licenses',$id,'Delete','Delete',$username);
-
+
+ echo json_encode(['success' => true]);
} else
{
//do nothing
diff --git a/api/v2/post/products_software_versions.php b/api/v2/post/products_software_versions.php
index 60417ab..18a3163 100644
--- a/api/v2/post/products_software_versions.php
+++ b/api/v2/post/products_software_versions.php
@@ -72,10 +72,9 @@ $hw_version = (isset($criterias['hw_version']))? $criterias['hw_version']:'';
if ($command == 'update' && isAllowed('products_software_versions',$profile,$permission,'U') === 1){
//REMOVE LATEST FLAG FROM OTHER WHEN SEND
+ //Max 2 latest flags per hw_version: 1 with price (has upgrade path with price) and 1 without
if (isset($criterias['latest']) && $criterias['latest'] == 1){
- $sql = 'UPDATE products_software_versions SET latest = 0 WHERE hw_version = ? AND rowID != ?';
- $stmt = $pdo->prepare($sql);
- $stmt->execute([$hw_version, $id]);
+ updateSoftwareLatestFlags($pdo, $id, $hw_version);
}
$sql = 'UPDATE products_software_versions SET '.$clause.' WHERE rowID = ? ';
@@ -84,18 +83,18 @@ if ($command == 'update' && isAllowed('products_software_versions',$profile,$per
$stmt->execute($execute_input);
}
elseif ($command == 'insert' && isAllowed('products_software_versions',$profile,$permission,'C') === 1){
-
- //REMOVE LATEST FLAG FROM OTHER IF SET
- if (isset($criterias['latest']) && $criterias['latest'] == 1){
- $sql = 'UPDATE products_software_versions SET latest = 0 WHERE hw_version = ?';
- $stmt = $pdo->prepare($sql);
- $stmt->execute([$hw_version]);
- }
//INSERT NEW ITEM
$sql = 'INSERT INTO products_software_versions ('.$clause_insert.') VALUES ('.$input_insert.')';
$stmt = $pdo->prepare($sql);
$stmt->execute($execute_input);
+ $new_id = $pdo->lastInsertId();
+
+ //REMOVE LATEST FLAG FROM OTHER IF SET
+ //Max 2 latest flags per hw_version: 1 with price (has upgrade path with price) and 1 without
+ if (isset($criterias['latest']) && $criterias['latest'] == 1){
+ updateSoftwareLatestFlags($pdo, $new_id, $hw_version);
+ }
}
elseif ($command == 'delete' && isAllowed('products_software_versions',$profile,$permission,'D') === 1){
diff --git a/assets/functions.php b/assets/functions.php
index a02c05f..6e50226 100644
--- a/assets/functions.php
+++ b/assets/functions.php
@@ -1418,7 +1418,8 @@ function getWhereclauselvl2($table_name,$permission,$partner,$method){
"software" => "p.accounthierarchy",
"transactions" => "tx.accounthierarchy",
"dealers" => "d.accounthierarchy",
- "categories" => "c.accounthierarchy"
+ "categories" => "c.accounthierarchy",
+ "products_software_licenses" => "l.accounthierarchy"
];
$table = ($table_name != '') ? $table[$table_name] : 'accounthierarchy';
@@ -5154,23 +5155,7 @@ function updateSoftwareVersionStatus($pdo, $serialnumber = null) {
$stmt->execute($bind_params);
//------------------------------------------
- // STEP 3: Set sw_version_latest = 0 for equipment NOT matching latest version
- //------------------------------------------
- $sql = 'UPDATE equipment e
- JOIN products_software_assignment psa ON e.productrowid = psa.product_id AND psa.status = 1
- JOIN products_software_versions psv ON psa.software_version_id = psv.rowID
- SET e.sw_version_latest = 0
- WHERE psv.latest = 1
- AND psv.status = 1
- AND lower(e.sw_version) <> lower(psv.version)
- AND (psv.hw_version = e.hw_version OR psv.hw_version IS NULL OR psv.hw_version = "")
- AND e.sw_version_latest = 1' . $sn_clause;
-
- $stmt = $pdo->prepare($sql);
- $stmt->execute($bind_params);
-
- //------------------------------------------
- // STEP 4: Set sw_version_latest = 1 for equipment matching latest version
+ // STEP 3: Set sw_version_latest = 1 for equipment matching latest version
//------------------------------------------
$sql = 'UPDATE equipment e
JOIN products_software_assignment psa ON e.productrowid = psa.product_id AND psa.status = 1
@@ -5179,7 +5164,7 @@ function updateSoftwareVersionStatus($pdo, $serialnumber = null) {
WHERE psv.latest = 1
AND psv.status = 1
AND lower(e.sw_version) = lower(psv.version)
- AND (psv.hw_version = e.hw_version OR psv.hw_version IS NULL OR psv.hw_version = "")
+ AND (lower(psv.hw_version) = lower(e.hw_version) OR lower(psv.hw_version) IS NULL OR lower(psv.hw_version) = "")
AND e.sw_version_latest = 0' . $sn_clause;
$stmt = $pdo->prepare($sql);
@@ -5542,4 +5527,49 @@ function generateSoftwareInvoice($invoice_data, $order_id, $language = 'US') {