[pull] master from opensourcepos:master

.travis.yml

@@ -22,6 +22,8 @@ script:
   - sed -i 's/opensourcepos.tar.gz/opensourcepos.$version.tgz/g' package.json
   - npm ci && npm install -g gulp && npm run build
   - docker build . --target ospos -t ospos
+  - docker build . --target ospos_test -t ospos_test
+  - docker run --rm ospos_test /app/vendor/bin/phpunit --testdox
   - docker build app/Database/ -t "jekkos/opensourcepos:sql-$TAG"
 env:
   global:

Dockerfile

@@ -22,7 +22,7 @@ RUN composer install -d/app
 #RUN sed -i 's/backupGlobals="true"/backupGlobals="false"/g' /app/tests/phpunit.xml
 WORKDIR /app/tests
 
-CMD ["/app/vendor/phpunit/phpunit/phpunit"]
+CMD ["/app/vendor/phpunit/phpunit/phpunit", "/app/test/helpers"]
 
 FROM ospos AS ospos_dev
 

app/Controllers/Sales.php

@@ -466,7 +466,9 @@ public function postAddPayment(): void
      */
     public function getDeletePayment(string $payment_id): void
     {
-        $this->sale_lib->delete_payment(base64_decode($payment_id));
+        helper('url');
+
+        $this->sale_lib->delete_payment(base64url_decode($payment_id));
 
         $this->_reload();    // TODO: Hungarian notation
     }

app/Helpers/url_helper.php

@@ -0,0 +1,31 @@
+<?php
+
+if (!function_exists('base64url_encode')) {
+    /**
+     * Encode data to Base64 URL-safe string.
+     *
+     * @param string $data
+     * @return string
+     */
+    function base64url_encode($data)
+    {
+        return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
+    }
+}
+
+if (!function_exists('base64url_decode')) {
+    /**
+     * Decode Base64 URL-safe string to original data.
+     *
+     * @param string $data
+     * @return string|false
+     */
+    function base64url_decode($data)
+    {
+        $remainder = strlen($data) % 4;
+        if ($remainder) {
+            $data .= str_repeat('=', 4 - $remainder);
+        }
+        return base64_decode(strtr($data, '-_', '+/'));
+    }
+}

app/Views/sales/register.php

@@ -57,6 +57,8 @@
 if (isset($success)) {
     echo '<div class="alert alert-dismissible alert-success">' . esc($success) . '</div>';
 }
+
+helper('url');
 ?>
 
 <div id="register_wrapper">
@@ -478,7 +480,7 @@
                         <tbody id="payment_contents">
                             <?php foreach ($payments as $payment_id => $payment) { ?>
                                 <tr>
-                                    <td><?= anchor("$controller_name/deletePayment/". base64_encode($payment_id), '<span class="glyphicon glyphicon-trash"></span>') ?></td>
+                                    <td><?= anchor("$controller_name/deletePayment/". base64url_encode($payment_id), '<span class="glyphicon glyphicon-trash"></span>') ?></td>
                                     <td><?= $payment['payment_type'] ?></td>
                                     <td style="text-align: right;"><?= to_currency($payment['payment_amount']) ?></td>
                                 </tr>

composer.json

@@ -31,6 +31,7 @@
         "matrix": "https://matrix.to/#/#opensourcepos_Lobby:gitter.im"
     },
     "require": {
+        "ext-intl": "*",
         "php": "^8.1",
         "codeigniter4/framework": "4.6.0",
         "dompdf/dompdf": "^2.0.3",

docker-compose.test.yml

@@ -1,5 +1,3 @@
-version: '2.2'
-
 include:
     - docker/docker-mysql.yml
 
@@ -18,6 +16,6 @@ services:
             - MYSQL_DATABASE=ospos
             - MYSQL_USERNAME=admin
             - MYSQL_PASSWORD=pointofsale
-        command: [ "/bin/wait-for-it.sh", "mysql:3306", "--", "/app/vendor/bin/phpunit", "/app/app/tests" ]
+        command: [ "/bin/wait-for-it.sh", "mysql:3306", "--", "/app/vendor/bin/phpunit", "/app/tests" ]
         ports:
             - "80:80"

tests/helpers/UrlHelperTest.php

@@ -0,0 +1,25 @@
+<?php
+
+    use PHPUnit\Framework\TestCase;
+
+    class UrlHelperTest extends TestCase
+    {
+        protected function setUp(): void
+        {
+            // Include the url_helper.php file
+            require_once __DIR__ . '/../../app/Helpers/url_helper.php';
+        }
+
+        public function testBase64urlEncode(): void
+        {
+            $data = 'Test data';
+            $encoded = base64url_encode($data);
+
+            // Assert that the encoded string is URL-safe
+            $this->assertMatchesRegularExpression('/^[A-Za-z0-9\-_]+$/', $encoded);
+
+            // Assert that decoding the encoded string returns the original data
+            $decoded = base64url_decode($encoded);
+            $this->assertEquals($data, $decoded);
+        }
+    }

tests/phpunit.xml

@@ -1,26 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap = "../../vendor/autoload.php"
+<phpunit bootstrap = "../vendor/autoload.php"
     backupGlobals               = "false"
-    backupStaticAttributes      = "false"
     colors                      = "true"
-    convertErrorsToExceptions   = "true"
-    convertNoticesToExceptions  = "true"
-    convertWarningsToExceptions = "true"
     processIsolation            = "false"
-    stopOnFailure               = "false"
-    syntaxCheck                 = "false">
+    stopOnFailure               = "false">
 
 <testsuites>
     <testsuite name="Helpers">
         <directory>helpers</directory>
     </testsuite>
-    <testsuite name="Libraries">
-        <directory>libraries</directory>
-    </testsuite>
-    <testsuite name="Models">
-        <directory>models</directory>
-    </testsuite>
 </testsuites>
 
 </phpunit>