Master

.eslintrc.js

@@ -37,7 +37,12 @@ module.exports = {
             "error",
             "last"
         ],
-        "complexity": "error",
+        "complexity": [
+            "error",
+            {
+                "max": 25
+            }
+        ],
         "computed-property-spacing": [
             "error",
             "never"

.gitignore

@@ -22,3 +22,5 @@ tcpdf/cache/*
 vendor
 .php_cs.cache
 db_data/*
+node_modules
+css/custom.css

.travis.yml

@@ -1,21 +1,20 @@
 sudo: false
 language: php
 php:
-  - 5.6
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 before_script:
   - phpenv config-rm xdebug.ini
   - phpenv rehash
   - composer install
-  - npm install -g eslint
+  - npm install -g eslint@6
 
 cache:
   directories:
     - $HOME/.composer/cache
     - .php_cs.cache
 
 script:
-- vendor/bin/phing travis -Dphp-cs-fixer-extra-params="--cache-file=.php_cs.cache/.php_cs.cache"
+- vendor/bin/phing ci -Dphp-cs-fixer-extra-params="--cache-file=.php_cs.cache/.php_cs.cache"

Gruntfile.js

@@ -0,0 +1,46 @@
+module.exports = function(grunt) {
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    watch: {
+      options: {
+        atBegin: true
+      },
+      scss: {
+        files: 'css/*.scss',
+        tasks: ['sass']
+      },
+      js: {
+        files: ['js/mlinvoice.js', 'js/mlinvoice-form.js'],
+        tasks: ['uglify']
+      }
+    },
+    uglify: {
+      options: {
+        banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
+        sourceMap: true
+      },
+      build: {
+        files: {
+          'js/mlinvoice.min.js': ['js/mlinvoice.js', 'js/mlinvoice-form.js']
+        }
+      }
+    },
+    sass: {
+      dist: {
+        options: {
+          style: 'compressed'
+        },
+        files: {
+          'css/style.css': 'css/style.scss',
+          'css/table.css': 'css/table.scss',
+        }
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+
+  grunt.loadNpmTasks('grunt-contrib-sass');
+
+  grunt.loadNpmTasks('grunt-contrib-watch');
+};

LICENSE

@@ -1,5 +1,5 @@
 MLInvoice: web-pohjainen laskutusohjelma.
-Copyright (C) 2010-2017 Ere Maijala
+Copyright (C) 2010-2019 Ere Maijala
 
 Perustuu osittain sovellukseen:
 PkLasku laskutusohjelma : web-pohjainen laskutusohjelma.
@@ -27,7 +27,7 @@ Ere Maijala
 ere at labs.fi
 
 MLInvoice: web-based invoicing application.
-Copyright (C) 2010-2017 Ere Maijala
+Copyright (C) 2010-2019 Ere Maijala
 
 Portions based on:
 PkLasku-invoicing : web-based invoicing software.

abstract_report.php

@@ -49,6 +49,58 @@ abstract class AbstractReport
      */
     abstract public function createReport();
 
+    /**
+     * Create a limit query
+     *
+     * @return array
+     */
+    protected function createLimitQuery()
+    {
+        $strQuery = '';
+        $arrParams = [];
+
+        $intBaseId = getPostOrQuery('base', false);
+        if ($intBaseId) {
+            $strQuery .= ' AND i.base_id = ?';
+            $arrParams[] = $intBaseId;
+        }
+        $intCompanyId = getPostOrQuery('company', false);
+        if ($intCompanyId) {
+            $strQuery .= ' AND i.company_id = ?';
+            $arrParams[] = $intCompanyId;
+        }
+
+        $dateRange = explode(' - ', getPostOrQuery('date', ''));
+        $startDate = $dateRange[0];
+        $endDate = isset($dateRange[1]) ? $dateRange[1] : $startDate;
+        if ($startDate) {
+            $strQuery .= ' AND i.invoice_date >= ?';
+            $arrParams[] = dateConvDate2DBDate($startDate);
+        }
+        if ($endDate) {
+            $strQuery .= ' AND i.invoice_date <= ?';
+            $arrParams[] = dateConvDate2DBDate($endDate);
+        }
+
+        if ($tags = getPostOrQuery('tags')) {
+            $tagsQuery = [];
+            foreach (explode(',', $tags) as $tag) {
+                $tag = trim($tag);
+                $tagsQuery[] = <<<EOT
+c.id IN (
+    SELECT ctl.company_id FROM {prefix}company_tag_link ctl WHERE ctl.tag_id=(
+        SELECT ct.id FROM {prefix}company_tag ct WHERE ct.tag=?
+    )
+)
+EOT;
+                $arrParams[] = $tag;
+            }
+            $strQuery .= ' AND (' . implode(' OR ', $tagsQuery) . ')';
+        }
+
+        return [$strQuery, $arrParams];
+    }
+
     /**
      * Get a string with the selected parameters
      *
@@ -63,9 +115,10 @@ protected function getParamsStr($html)
             'accounting_date' => ['name' => 'DateInterval'],
             'row_date' => ['name' => 'InvoiceRowDateInterval'],
             'payment_date' => ['name' => 'PaymentDateInterval'],
+            'tags' => ['name' => 'Tags'],
             'base' => [
                 'name' => 'Biller',
-                'sql' => 'SELECT name FROM {prefix}base WHERE id = ?'
+                'sql' => 'SELECT name as v FROM {prefix}base WHERE id = ?'
             ],
             'company' => [
                 'name' => 'Client',
@@ -128,7 +181,7 @@ protected function getParamsStr($html)
         $states = [];
         while ($row = mysqli_fetch_assoc($res)) {
             $stateId = $row['id'];
-            if (getRequest("stateid_$stateId", false)) {
+            if (getPostOrQuery("stateid_$stateId", false)) {
                 $states[] = Translator::translate($row['name']);
             }
         }
@@ -149,7 +202,7 @@ protected function getParamsStr($html)
     protected function addInvoiceStateSelection()
     {
         ?>
-        <div style="float: left; margin-right: 20px;">
+        <div class="invoice-states">
             <div class="medium_label"><?php echo Translator::translate('PrintReportStates')?></div>
         <?php
         $strQuery = 'SELECT id, name, invoice_offer FROM {prefix}invoice_state WHERE deleted=0'
@@ -159,7 +212,7 @@ protected function addInvoiceStateSelection()
         while ($row = mysqli_fetch_assoc($intRes)) {
             $intStateId = $row['id'];
             $strStateName = Translator::translate($row['name']);
-            $strChecked = getRequest("stateid_$intStateId", $row['invoice_offer'] ? false : true) ? ' checked' : '';
+            $strChecked = getPostOrQuery("stateid_$intStateId", $row['invoice_offer'] ? false : true) ? ' checked' : '';
             if (!$first) {
                 echo "      <div class=\"medium_label\"></div>\n";
             }

accounting_report.php

@@ -54,9 +54,10 @@ public function __construct()
      */
     protected function addLimitSelection()
     {
-        $intBaseId = getRequest('base', false);
-        $intCompanyId = getRequest('company', false);
-        $dateRange = getRequest('date', '');
+        $intBaseId = getPostOrQuery('base', false);
+        $intCompanyId = getPostOrQuery('company', false);
+        $dateRange = getPostOrQuery('date', '');
+        $companyTags = getPostOrQuery('tags', '');
         ?>
             <div class="medium_label">
                 <?php echo Translator::translate('DateInterval')?>
@@ -78,6 +79,11 @@ protected function addLimitSelection()
             <div class="field">
                 <?php echo htmlFormElement('company', 'LIST', $intCompanyId, 'medium', 'SELECT id, company_name FROM {prefix}company WHERE deleted=0 ORDER BY company_name', 'MODIFY', false)?>
             </div>
+
+            <div class="medium_label"><?php echo Translator::translate('Tags')?></div>
+            <div class="field">
+                <?php echo htmlFormElement('tags', 'TAGS', $companyTags, 'noemptyvalue long', 'table=company_tag&sort=tag', 'MODIFY', false)?>
+            </div>
         <?php
     }
 
@@ -99,7 +105,7 @@ protected function createLimitQuery()
     {
         list($query, $params) = parent::createLimitQuery();
 
-        $dateRange = explode(' - ', getRequest('accounting_date', ''));
+        $dateRange = explode(' - ', getPostOrQuery('accounting_date', ''));
         $startDate = $dateRange[0];
         $endDate = isset($dateRange[1]) ? $dateRange[1] : $startDate;
         if ($startDate) {

attachment.php

@@ -40,8 +40,8 @@
 require_once 'datefuncs.php';
 require_once 'miscfuncs.php';
 
-$id = getRequest('id', false);
-$type = getRequest('type', false);
+$id = getPostOrQuery('id', false);
+$type = getPostOrQuery('type', false);
 
 $attachment = 'invoice' === $type ? getInvoiceAttachment($id) : getAttachment($id);
 if ($attachment) {

base_logo.php

@@ -33,8 +33,8 @@
 
 sesVerifySession();
 
-$func = getRequest('func', 'view');
-$baseId = getRequest('id', null);
+$func = getPostOrQuery('func', 'view');
+$baseId = getPostOrQuery('id', null);
 
 if (!isset($baseId) || !is_numeric($baseId) || !isset($func)) {
     exit();
@@ -112,22 +112,22 @@
 
 echo htmlPageStart();
 ?>
-<div class="form_container ui-widget-content">
+<div class="form_container ui-widget-content base-logo">
     <div class="message"><?php echo $messages?></div>
 
     <div class="form ui-widget">
-        <div style="margin-bottom: 10px">
+        <div class="image-link">
             <img class="image" src="?func=view&amp;id=<?php echo $baseId?>">
         </div>
         <form id="form_upload" enctype="multipart/form-data"
             action="base_logo.php" method="POST">
             <input type="hidden" name="func" value="upload"> <input type="hidden"
                 name="id" value="<?php echo $baseId?>">
-            <div class="label" style="clear: both; margin-top: 10px; margin-bottom: 10px"><?php printf(Translator::translate('BaseLogo'), $maxFileSize)?></div>
+            <div class="label file"><?php printf(Translator::translate('BaseLogo'), $maxFileSize)?></div>
             <div class="long">
                 <input name="logo" type="file">
             </div>
-            <div class="form_buttons" style="clear: both">
+            <div class="form_buttons">
                 <input type="submit"
                     value="<?php echo Translator::translate('BaseSaveLogo')?>">
             </div>
@@ -136,7 +136,7 @@
             action="base_logo.php" method="POST">
             <input type="hidden" name="func" value="clear"> <input type="hidden"
                 name="id" value="<?php echo $baseId?>">
-            <div class="form_buttons" style="clear: both">
+            <div class="form_buttons">
                 <input type="submit"
                     value="<?php echo Translator::translate('BaseEraseLogo')?>">
             </div>

build.xml

@@ -5,8 +5,8 @@
   <property name="php-cs-fixer-rules" value="no_spaces_after_function_name,no_trailing_whitespace,no_unused_imports,lowercase_keywords,encoding,no_spaces_inside_parenthesis,no_closing_tag,visibility_required,no_empty_statement,no_extra_consecutive_blank_lines,no_blank_lines_after_class_opening,no_blank_lines_after_phpdoc,binary_operator_spaces,no_singleline_whitespace_before_semicolons,ternary_operator_spaces,phpdoc_no_access,no_leading_import_slash" />
   <property name="php-cs-fixer-extra-params" value=""/>
 
-  <!-- Travis Tasks -->
-  <target name="travis" description="Travis tasks">
+  <!-- CI Checks -->
+  <target name="ci" description="CI checks">
     <!-- Call standard tasks -->
     <phingcall target="eslint"/>
     <phingcall target="phpcs-n"/>
@@ -15,10 +15,10 @@
 
   <!-- eslint -->
   <target name="eslint">
-    <exec command="eslint js/functions.js js/mlinvoice.js js/stock_balance.js" escape="false" checkreturn="true" passthru="true" />
+    <exec command="eslint js/mlinvoice.js js/mlinvoice-form.js" escape="false" checkreturn="true" passthru="true" />
   </target>
   <target name="eslint-fix">
-    <exec command="eslint js/functions.js js/mlinvoice.js js/stock_balance.js --fix" escape="false" checkreturn="true" passthru="true" />
+    <exec command="eslint js/mlinvoice.js js/mlinvoice-form.js --fix" escape="false" checkreturn="true" passthru="true" />
   </target>
 
   <!-- PHP CodeSniffer -->

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "emaijala/MLInvoice",
+    "name": "emaijala/mlinvoice",
     "description": "Free web-based invoicing primarily for Finnish companies",
     "authors": [
         {
@@ -10,23 +10,22 @@
     "license": "GPL-2.0",
     "config": {
         "platform": {
-            "php": "5.6.0"
+            "php": "7.2.5"
         }
     },
     "require": {
-        "michelf/php-markdown": "^1.8",
-        "paragonie/random_compat": "^2.0",
-        "ramsey/uuid": "^3.7",
-        "setasign/fpdi": "^2.1",
-        "swiftmailer/swiftmailer": "^5.4",
-        "tecnickcom/tcpdf": "^6.2",
-        "guzzlehttp/guzzle": "^6.3",
-        "phpseclib/phpseclib": "^2.0"
+        "michelf/php-markdown": "^1.9.0",
+        "ramsey/uuid": "^4.1.1",
+        "setasign/fpdi": "^2.3.4",
+        "swiftmailer/swiftmailer": "^6.2.3",
+        "tecnickcom/tcpdf": "^6.3.5",
+        "guzzlehttp/guzzle": "^7.2.0",
+        "phpseclib/phpseclib": "^2.0.31"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^v2.10.3",
-        "phing/phing" : "^2.16.1",
-        "squizlabs/php_codesniffer": "^3.2.3"
+        "friendsofphp/php-cs-fixer": "^v2.16.4",
+        "phing/phing" : "^2.16.3",
+        "squizlabs/php_codesniffer": "^3.5.6"
     },
     "scripts": {
         "post-install-cmd": [